diff options
| author | Andrey Kvochko <a.kvochko@samsung.com> | 2018-12-24 19:23:55 +0300 |
|---|---|---|
| committer | Andrey Kvochko <a.kvochko@samsung.com> | 2018-12-25 13:06:48 +0300 |
| commit | a5118b561433f03a819087de40aaa815b7acef26 (patch) | |
| tree | f2cffa5fabb606ea3aa4ec23639ae61f32a92529 /src | |
| parent | a548a0e6d1aa8ee795f024f129d5393c02328370 (diff) | |
| download | coreclr-a5118b561433f03a819087de40aaa815b7acef26.tar.gz coreclr-a5118b561433f03a819087de40aaa815b7acef26.tar.bz2 coreclr-a5118b561433f03a819087de40aaa815b7acef26.zip | |
Fix CFI code offsets in prolog on ARM
Diffstat (limited to 'src')
| -rw-r--r-- | src/jit/emit.cpp | 2 | ||||
| -rw-r--r-- | src/jit/emit.h | 2 | ||||
| -rw-r--r-- | src/jit/unwind.cpp | 4 |
3 files changed, 0 insertions, 8 deletions
diff --git a/src/jit/emit.cpp b/src/jit/emit.cpp index 4a3afc1ab0..d76043bde6 100644 --- a/src/jit/emit.cpp +++ b/src/jit/emit.cpp @@ -51,7 +51,6 @@ int emitLocation::GetInsNum() const return emitGetInsNumFromCodePos(codePos); } -#ifdef _TARGET_AMD64_ // Get the instruction offset in the current instruction group, which must be a funclet prolog group. // This is used to find an instruction offset used in unwind data. // TODO-AMD64-Bug?: We only support a single main function prolog group, but allow for multiple funclet prolog @@ -65,7 +64,6 @@ UNATIVE_OFFSET emitLocation::GetFuncletPrologOffset(emitter* emit) const return emit->emitCurIGsize; } -#endif // _TARGET_AMD64_ #ifdef DEBUG void emitLocation::Print() const diff --git a/src/jit/emit.h b/src/jit/emit.h index dbfb178867..a8ef7835e1 100644 --- a/src/jit/emit.h +++ b/src/jit/emit.h @@ -203,9 +203,7 @@ public: return true; } -#ifdef _TARGET_AMD64_ UNATIVE_OFFSET GetFuncletPrologOffset(emitter* emit) const; -#endif // _TARGET_AMD64_ #ifdef DEBUG void Print() const; diff --git a/src/jit/unwind.cpp b/src/jit/unwind.cpp index 07296480be..86ce3312c8 100644 --- a/src/jit/unwind.cpp +++ b/src/jit/unwind.cpp @@ -398,12 +398,8 @@ UNATIVE_OFFSET Compiler::unwindGetCurrentOffset(FuncInfoDsc* func) } else { -#if defined(_TARGET_AMD64_) assert(func->startLoc != nullptr); offset = func->startLoc->GetFuncletPrologOffset(genEmitter); -#else - offset = 0; // TODO ??? -#endif } return offset; |