experimenting more

Author: wyrichte

lib/Runtime/Base/FunctionBody.cpp

@@ -3302,6 +3302,11 @@ namespace Js
             {
                 entryPoint = currentEntryPoint;
             }
+            if (currentEntryPoint->lboNativeAddr <= codeAddress && currentEntryPoint->lboNativeAddr + currentEntryPoint->lboCodeSize > codeAddress)
+            {
+                entryPoint = currentEntryPoint;
+            }
+
         });
 
         return entryPoint;
@@ -9277,7 +9282,7 @@ namespace Js
 
     }
 
-    void FunctionEntryPointInfo::Invalidate(bool prolongEntryPoint)
+    FunctionEntryPointInfo* FunctionEntryPointInfo::InvalidateRet(bool prolongEntryPoint)
     {
         Assert(!this->functionProxy->IsDeferred());
         FunctionBody* functionBody = this->functionProxy->GetFunctionBody();
@@ -9336,6 +9341,8 @@ namespace Js
             ThreadContext* threadContext = this->functionProxy->GetScriptContext()->GetThreadContext();
             threadContext->QueueFreeOldEntryPointInfoIfInScript(this);
         }
+
+        return entryPoint;
     }
 
     void FunctionEntryPointInfo::Expire()

lib/Runtime/Base/FunctionBody.h

@@ -622,6 +622,8 @@ namespace Js
 
         Field(uint32) callsCount;
         Field(uint32) lastCallsCount;
+        Field(DWORD_PTR) lboNativeAddr;
+        Field(ptrdiff_t) lboCodeSize;
 
     private:
         Field(ExecutionMode) jitMode;
@@ -638,6 +640,7 @@ namespace Js
         ExecutionMode GetJitMode() const;
         void SetJitMode(const ExecutionMode jitMode);
 
+        FunctionEntryPointInfo* InvalidateRet(bool prolongEntryPoint);
         virtual void Invalidate(bool prolongEntryPoint) override;
         virtual void Expire() override;
         virtual void EnterExpirableCollectMode() override;

lib/Runtime/Base/ThreadContext.cpp

@@ -3760,14 +3760,23 @@ ThreadContext::InvalidatePropertyGuardEntry(
 
     if (propertyGuardEntry->lazyBailOutEntryPoints && propertyGuardEntry->lazyBailOutEntryPoints->Count() > 0)
     {
-        propertyGuardEntry->lazyBailOutEntryPoints->Map([=](Js::EntryPointInfo* lazyBailOutEntryPoint, BYTE& dummy, const RecyclerWeakReference<Js::EntryPointInfo>* infoWeakRef)
+        if (!propertyGuardEntry->hasLazyBailOut)
+        {
+            int a = 5;
+            a++;
+
+        }
+
+        propertyGuardEntry->lazyBailOutEntryPoints->Map([=](Js::FunctionEntryPointInfo* lazyBailOutEntryPoint, BYTE& dummy, const RecyclerWeakReference<Js::EntryPointInfo>* infoWeakRef)
         {
             if (lazyBailOutEntryPoint->IsCleanedUp())
             {
                 return;
             }
             OUTPUT_TRACE2(Js::LazyBailoutPhase, lazyBailOutEntryPoint->GetFunctionBody(), _u("Lazy bailout - Invalidation due to property: %s \n"), propertyRecord->GetBuffer());
-            lazyBailOutEntryPoint->Invalidate(true);
+            Js::FunctionEntryPointInfo* newEntryPoint = lazyBailOutEntryPoint->InvalidateRet(true);
+            newEntryPoint->lboCodeSize = lazyBailOutEntryPoint->GetCodeSize();
+            newEntryPoint->lboNativeAddr = lazyBailOutEntryPoint->GetNativeAddress();
         });
 
         // TODO: make function.