Skip to content

Commit c4401d2

Browse files
joransiuofrobots
authored andcommitted
deps: cherry-pick 2b4c9c1 from v8 upstream
Original commit message: S390:Update inline asm constraint in test-platform The GetStackPointer() routine in test-platform uses an inline assembly code to store the current stack pointer value into a static variable sp_addr. The existing asm code for S390 uses an ST/STG instruction, with the memory operand associated with the general ('=g') constraint to sp_addr. On GCC 4.8.5, the GCC compiler got confused and treated sp_addr as an integer operand instead of memory operand, resulting in a store being emitted that writes to an invalid meory location. Given the specific store instructions being inlined here, we should restict the sp_addr operand to explicitly be a memory operand using '=m' instead of '=g'. R=bmeurer@chromium.org,jkummerow@chormium.org,rmcilroy@chromium.org,yangguo@chromium.org BUG= Review-Url: https://codereview.chromium.org/2158523002 Cr-Commit-Position: refs/heads/master@{#37809} Fixes: #7659 PR-URL: #7771 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
1 parent 0ac21bc commit c4401d2

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

deps/v8/include/v8-version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#define V8_MAJOR_VERSION 5
1212
#define V8_MINOR_VERSION 1
1313
#define V8_BUILD_NUMBER 281
14-
#define V8_PATCH_LEVEL 76
14+
#define V8_PATCH_LEVEL 77
1515

1616
// Use 1 for candidates and 0 otherwise.
1717
// (Boolean macro values are not supported by all preprocessors.)

deps/v8/test/cctest/test-platform.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ void GetStackPointer(const v8::FunctionCallbackInfo<v8::Value>& args) {
2525
#elif V8_HOST_ARCH_MIPS64
2626
__asm__ __volatile__("sd $sp, %0" : "=g"(sp_addr));
2727
#elif defined(__s390x__) || defined(_ARCH_S390X)
28-
__asm__ __volatile__("stg 15, %0" : "=g"(sp_addr));
28+
__asm__ __volatile__("stg 15, %0" : "=m"(sp_addr));
2929
#elif defined(__s390__) || defined(_ARCH_S390)
30-
__asm__ __volatile__("st 15, %0" : "=g"(sp_addr));
30+
__asm__ __volatile__("st 15, %0" : "=m"(sp_addr));
3131
#elif defined(__PPC64__) || defined(_ARCH_PPC64)
3232
__asm__ __volatile__("std 1, %0" : "=g"(sp_addr));
3333
#elif defined(__PPC__) || defined(_ARCH_PPC)

0 commit comments

Comments
 (0)