GeezerVison is showing github.com — deps: V8: cherry-pick b161a0823165 · nodejs/node@c8ff2df
File tree
Expand file treeCollapse file tree
Open diff view settings
Expand file treeCollapse file tree
Open diff view settings
Collapse file
Copy file name to clipboardExpand all lines: common.gypi +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
|
36 | 36 |
|
37 | 37 | # Reset this number to 0 on major V8 upgrades. |
38 | 38 | # Increment by one for each non-official patch applied to deps/v8. |
39 | | - 'v8_embedder_string': '-node.7', |
| 39 | + 'v8_embedder_string': '-node.8', |
40 | 40 |
|
41 | 41 | ##### V8 defaults for Node.js ##### |
42 | 42 |
|
|
Collapse file
Copy file name to clipboardExpand all lines: deps/v8/src/trap-handler/handler-outside-simulator.cc +12Lines changed: 12 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
|
11 | 11 | #define SYMBOL(name) #name |
12 | 12 | #endif // !V8_OS_DARWIN |
13 | 13 |
|
| 14 | +#if defined(_MSC_VER) && !defined(__clang__) |
| 15 | +// MSVC does not accept inline assembly |
| 16 | +#include <intrin.h> |
| 17 | +extern "C" uintptr_t ProbeMemory(uintptr_t address, uintptr_t pc) { |
| 18 | + // @pc parameter is unused. |
| 19 | + // This intrinsic guarantees that a load from address will be done. |
| 20 | + __iso_volatile_load8(reinterpret_cast<char*>(address)); |
| 21 | + return 0; |
| 22 | +} |
| 23 | +extern "C" void v8_probe_memory_continuation() {} |
| 24 | +#else |
14 | 25 | // Define the ProbeMemory function declared in trap-handler-simulators.h. |
15 | 26 | asm( |
16 | 27 | ".globl " SYMBOL(ProbeMemory) " \n" |
|
35 | 46 | SYMBOL(v8_probe_memory_continuation) ": \n" |
36 | 47 | // If the trap handler continues here, it wrote the landing pad in %rax. |
37 | 48 | " ret \n"); |
| 49 | +#endif |