Instead of using ehBailOutData, use interpreter flags to mark inlinee

chakra-core · Oct 6, 2017 · 81c558b · 81c558b
1 parent c1c7339
commit 81c558b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 18 deletions.
diff --git a/lib/Backend/BailOut.cpp b/lib/Backend/BailOut.cpp
@@ -1608,6 +1608,10 @@ BailOutRecord::BailOutHelper(Js::JavascriptCallStackLayout * layout, Js::ScriptF
     {
         newInstance->OrFlags(Js::InterpreterStackFrameFlags_ProcessingBailOutOnArrayAccessHelperCall);
     }
+    if (isInlinee)
+    {
+        newInstance->OrFlags(Js::InterpreterStackFrameFlags_FromInlineeCodeInEHBailOut);
+    }
 
     ThreadContext *threadContext = newInstance->GetScriptContext()->GetThreadContext();
 

diff --git a/lib/Backend/LinearScan.cpp b/lib/Backend/LinearScan.cpp
@@ -1373,11 +1373,6 @@ LinearScan::FillBailOutRecord(IR::Instr * instr)
         if (currentRegionType == RegionTypeTry || currentRegionType == RegionTypeCatch || currentRegionType == RegionTypeFinally)
         {
             bailOutInfo->bailOutRecord->ehBailoutData = this->currentRegion->ehBailoutData;
-            if (this->func != instr->m_func)
-            {
-                bailOutInfo->bailOutRecord->ehBailoutData = NativeCodeDataNew(func->GetNativeCodeDataAllocator(), Js::EHBailoutData, this->currentRegion->ehBailoutData);
-                bailOutInfo->bailOutRecord->ehBailoutData->inlineeCode = true;
-            }
         }
     }
 
@@ -1422,11 +1417,7 @@ LinearScan::FillBailOutRecord(IR::Instr * instr)
             RegionType currentRegionType = this->currentRegion->GetType();
             if (currentRegionType == RegionTypeTry || currentRegionType == RegionTypeCatch || currentRegionType == RegionTypeFinally)
             {
-                bailOutRecord->ehBailoutData = NativeCodeDataNew(func->GetNativeCodeDataAllocator(), Js::EHBailoutData, this->currentRegion->ehBailoutData);
-                if (currentFunc != this->func)
-                {
-                    bailOutRecord->ehBailoutData->inlineeCode = true;
-                }
+                bailOutRecord->ehBailoutData = this->currentRegion->ehBailoutData;
             }
         }
         funcBailOutData[funcIndex].bailOutRecord->parent = bailOutRecord;

diff --git a/lib/Runtime/Language/EHBailoutData.h b/lib/Runtime/Language/EHBailoutData.h
@@ -21,10 +21,9 @@ namespace Js
         HandlerType ht;
         EHBailoutData * parent;
         EHBailoutData * child;
-        bool inlineeCode;
 
     public:
-        EHBailoutData() : nestingDepth(-1), catchOffset(0), finallyOffset(0), parent(nullptr), child(nullptr),  ht(HT_None), inlineeCode(nullptr) {}
+        EHBailoutData() : nestingDepth(-1), catchOffset(0), finallyOffset(0), parent(nullptr), child(nullptr),  ht(HT_None) {}
         EHBailoutData(int32 nestingDepth, int32 catchOffset, int32 finallyOffset, HandlerType ht, EHBailoutData * parent)
         {
             this->nestingDepth = nestingDepth;
@@ -33,7 +32,6 @@ namespace Js
             this->ht = ht;
             this->parent = parent;
             this->child = nullptr;
-            this->inlineeCode = false;
         }
         EHBailoutData(EHBailoutData * other)
         {
@@ -43,7 +41,6 @@ namespace Js
             this->ht = other->ht;
             this->parent = other->parent;
             this->child = nullptr;
-            this->inlineeCode = false;
         }
 #if ENABLE_NATIVE_CODEGEN
         void Fixup(NativeCodeData::DataChunk* chunkList)

diff --git a/lib/Runtime/Language/InterpreterStackFrame.cpp b/lib/Runtime/Language/InterpreterStackFrame.cpp
@@ -3283,7 +3283,7 @@ namespace Js
         } autoRestore(this);
 #endif
 
-        if (this->ehBailoutData && !this->ehBailoutData->inlineeCode)
+        if (this->ehBailoutData && !(m_flags & InterpreterStackFrameFlags_FromInlineeCodeInEHBailOut))
         {
             if ((m_flags & Js::InterpreterStackFrameFlags_FromBailOut) && !(m_flags & InterpreterStackFrameFlags_ProcessingBailOutFromEHCode))
             {
@@ -6628,8 +6628,6 @@ const byte * InterpreterStackFrame::OP_ProfiledLoopBodyStart(const byte * ip)
         int finallyOffset = ehBailoutData->finallyOffset;
         Js::JavascriptExceptionObject* exception = NULL;
 
-        Assert(this->ehBailoutData->inlineeCode == false);
-
         if (catchOffset != 0 || finallyOffset != 0)
         {
             try

diff --git a/lib/Runtime/Language/InterpreterStackFrame.h b/lib/Runtime/Language/InterpreterStackFrame.h
@@ -27,6 +27,7 @@ namespace Js
         InterpreterStackFrameFlags_FromBailOut = 8,
         InterpreterStackFrameFlags_ProcessingBailOutOnArrayAccessHelperCall = 0x10,
         InterpreterStackFrameFlags_ProcessingBailOutFromEHCode = 0x20,
+        InterpreterStackFrameFlags_FromInlineeCodeInEHBailOut = 0x40,
         InterpreterStackFrameFlags_All = 0xFFFF,
     };
 

diff --git a/test/EH/rlexe.xml b/test/EH/rlexe.xml
@@ -134,7 +134,7 @@
       <files>tfinlinebug.js</files>
       <compile-flags> -force:inline </compile-flags>
     </default>
-  </test
+  </test>
   <test>
     <default>
       <files>inlinestackwalkbug.js</files>