diff --git a/src/coreclr/vm/callhelpers.h b/src/coreclr/vm/callhelpers.h index 6733043084c13a..74d4453bbfb5b8 100644 --- a/src/coreclr/vm/callhelpers.h +++ b/src/coreclr/vm/callhelpers.h @@ -10,10 +10,7 @@ #define __CALLHELPERS_H__ #ifdef TARGET_WASM -// A sentinel value to indicate to the stack walker that this frame is NOT R2R generated managed code, -// and it should look for the next Frame in the Frame chain to make further progress. -#define TERMINATE_R2R_STACK_WALK 1 - +#include "wasm/callhelpers.hpp" #endif struct CallDescrData diff --git a/src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp b/src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp index b086417746a120..c0265475c3447d 100644 --- a/src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp +++ b/src/coreclr/vm/wasm/callhelpers-interp-to-managed.cpp @@ -8,6 +8,7 @@ // #include +#include // Arguments are passed on the stack with each argument aligned to INTERP_STACK_SLOT_SIZE. #define ARG_ADDR(i) (pArgs + (i * INTERP_STACK_SLOT_SIZE)) diff --git a/src/coreclr/vm/wasm/callhelpers.hpp b/src/coreclr/vm/wasm/callhelpers.hpp index 4daf53f827047a..63354ce3df7578 100644 --- a/src/coreclr/vm/wasm/callhelpers.hpp +++ b/src/coreclr/vm/wasm/callhelpers.hpp @@ -5,6 +5,10 @@ #ifndef __WASM_CALLHELPERS_HPP__ #define __WASM_CALLHELPERS_HPP__ +// A sentinel value to indicate to the stack walker that this frame is NOT R2R generated managed code, +// and it should look for the next Frame in the Frame chain to make further progress. +#define TERMINATE_R2R_STACK_WALK 1 + struct StringToWasmSigThunk { const char* key; diff --git a/src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs b/src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs index 54fecd5f9df6e3..711b88198e1062 100644 --- a/src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs +++ b/src/tasks/WasmAppBuilder/coreclr/InterpToNativeGenerator.cs @@ -74,6 +74,7 @@ private static void Emit(StreamWriter w, IEnumerable cookies) // #include + #include // Arguments are passed on the stack with each argument aligned to INTERP_STACK_SLOT_SIZE. #define ARG_ADDR(i) (pArgs + (i * INTERP_STACK_SLOT_SIZE))