Skip to content

Commit 9225758

Browse files
joransiutargos
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'. [email protected],[email protected],[email protected],[email protected] BUG= Review-Url: https://codereview.chromium.org/2158523002 Cr-Commit-Position: refs/heads/master@{nodejs#37809} Fixes: nodejs#7659 PR-URL: nodejs#7771 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Ali Ijaz Sheikh <[email protected]>
1 parent e19f71b commit 9225758

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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)