Add DummyVirtualFunctionToHinderLinkerICF

Author: nhat-nguyen

lib/Backend/amd64/LinearScanMD.cpp

@@ -510,13 +510,14 @@ IR::Instr* LinearScanMD::GeneratorBailIn::GenerateBailIn(IR::Instr* resumeLabelI
         LinearScan::InsertMove(LowererMD::CreateStackArgumentsSlotOpnd(this->func), this->rcxRegOpnd, instrAfter);
     }
 
-    BailInInsertionPoint insertionPoint = {
+    BailInInsertionPoint insertionPoint
+    {
         nullptr,    /* raxRestoreInstr */
         instrAfter, /* instrInsertStackSym */
         instrAfter  /* instrInsertRegSym */
     };
 
-    SaveInitializedRegister saveInitializedReg = { false /* rax */, false /* rcx */ };
+    SaveInitializedRegister saveInitializedReg { false /* rax */, false /* rcx */ };
 
     // 4) Restore symbols
     // - We don't need to restore argObjSyms because StackArgs is currently not enabled

lib/Backend/amd64/LinearScanMD.h

@@ -83,9 +83,9 @@ class LinearScanMD : public LinearScanMDShared
         // The following 3 instructions indicate the insertion points for the above cases:
         struct BailInInsertionPoint
         {
-            IR::Instr* raxRestoreInstr = nullptr;
-            IR::Instr* instrInsertStackSym = nullptr;
-            IR::Instr* instrInsertRegSym = nullptr;
+            IR::Instr* raxRestoreInstr;
+            IR::Instr* instrInsertStackSym;
+            IR::Instr* instrInsertRegSym;
         };
 
         // There are symbols that we don't need to restore such as constant values,
@@ -95,8 +95,8 @@ class LinearScanMD : public LinearScanMDShared
         // So we would need to save their values (and restore afterwards) before generating the bail-in code.
         struct SaveInitializedRegister
         {
-            bool rax = false;
-            bool rcx = false;
+            bool rax;
+            bool rcx;
         };
 
         Func* const func;

lib/Common/BackendApi.h

@@ -266,6 +266,10 @@ enum VTableValue {
     VtableJavascriptRegExp,
     VtableScriptFunction,
 
+    VtableScriptFunctionWithHomeObj,
+    VtableScriptFunctionWithComputedName,
+    VtableScriptFunctionWithHomeObjAndComputedName,
+
     // Generator/Async functions
     VtableJavascriptGeneratorFunction,
     VtableVirtualJavascriptGeneratorFunctionWithHomeObj,
@@ -274,7 +278,9 @@ enum VTableValue {
     VtableJavascriptAsyncFunction,
 
     VtableStackScriptFunction,
+    VtableAsmJsScriptFunction,
     VtableScriptFunctionWithInlineCacheAndHomeObj,
+    VtableScriptFunctionWithInlineCacheAndComputedName,
     VtableScriptFunctionWithInlineCacheHomeObjAndComputedName,
     VtableConcatStringMulti,
     VtableCompoundString,

lib/JITIDL/JITTypes.h

@@ -78,7 +78,7 @@ typedef unsigned char boolean;
 #define __JITTypes_h__
 
 // TODO: OOP JIT, how do we make this better?
-const int VTABLE_COUNT = 54;
+const int VTABLE_COUNT = 59;
 const int EQUIVALENT_TYPE_CACHE_SIZE = 8;
 
 typedef IDL_DEF([context_handle]) void * PTHREADCONTEXT_HANDLE;

lib/Runtime/Library/ScriptFunction.cpp

@@ -867,3 +867,53 @@ using namespace Js;
         }
         SetHasInlineCaches(false);
     }
+
+    template <> VTableValue Js::FunctionWithComputedName<Js::AsmJsScriptFunction>::DummyVirtualFunctionToHinderLinkerICF() const
+    {
+        return VTableValue::VtableAsmJsScriptFunction;
+    }
+
+    template <> VTableValue Js::FunctionWithHomeObj<Js::ScriptFunction>::DummyVirtualFunctionToHinderLinkerICF() const
+    {
+        return VTableValue::VtableScriptFunctionWithHomeObj;
+    }
+
+    template <> VTableValue Js::FunctionWithComputedName<Js::ScriptFunction>::DummyVirtualFunctionToHinderLinkerICF() const
+    {
+        return VTableValue::VtableScriptFunctionWithComputedName;
+    }
+
+    template <> VTableValue Js::FunctionWithComputedName<Js::FunctionWithHomeObj<Js::ScriptFunction>>::DummyVirtualFunctionToHinderLinkerICF() const
+    {
+        return VTableValue::VtableScriptFunctionWithHomeObjAndComputedName;
+    }
+
+    template <> VTableValue Js::FunctionWithHomeObj<Js::ScriptFunctionWithInlineCache>::DummyVirtualFunctionToHinderLinkerICF() const
+    {
+        return VTableValue::VtableScriptFunctionWithInlineCacheAndHomeObj;
+    }
+
+    template <> VTableValue Js::FunctionWithComputedName<Js::ScriptFunctionWithInlineCache>::DummyVirtualFunctionToHinderLinkerICF() const
+    {
+        return VTableValue::VtableScriptFunctionWithInlineCacheAndComputedName;
+    }
+
+    template <> VTableValue Js::FunctionWithComputedName<Js::FunctionWithHomeObj<Js::ScriptFunctionWithInlineCache>>::DummyVirtualFunctionToHinderLinkerICF() const
+    {
+        return VTableValue::VtableScriptFunctionWithInlineCacheHomeObjAndComputedName;
+    }
+
+    template <> VTableValue Js::FunctionWithHomeObj<Js::GeneratorVirtualScriptFunction>::DummyVirtualFunctionToHinderLinkerICF() const
+    {
+        return VTableValue::VtableVirtualJavascriptGeneratorFunctionWithHomeObj;
+    }
+
+    template <> VTableValue Js::FunctionWithComputedName<Js::GeneratorVirtualScriptFunction>::DummyVirtualFunctionToHinderLinkerICF() const
+    {
+        return VTableValue::VtableVirtualJavascriptGeneratorFunctionWithComputedName;
+    }
+
+    template <> VTableValue Js::FunctionWithComputedName<Js::FunctionWithHomeObj<Js::GeneratorVirtualScriptFunction>>::DummyVirtualFunctionToHinderLinkerICF() const
+    {
+        return VTableValue::VtableVirtualJavascriptGeneratorFunctionWithHomeObjAndComputedName;
+    }

lib/Runtime/Library/ScriptFunction.h

@@ -41,6 +41,7 @@ namespace Js
         }
         virtual Var GetComputedNameVar() const override { return this->computedNameVar; }
         virtual void SetComputedNameVar(Var computedNameVar) override { this->computedNameVar = computedNameVar; }
+        virtual VTableValue DummyVirtualFunctionToHinderLinkerICF() const;
     };
 
     template <class BaseClass>
@@ -60,6 +61,7 @@ namespace Js
         virtual Var GetHomeObj() const override { return homeObj; }
         virtual void SetHomeObj(Var homeObj) override { this->homeObj = homeObj; }
         static uint32 GetOffsetOfHomeObj() { return  offsetof(FunctionWithHomeObj<BaseClass>, homeObj); }
+        virtual VTableValue DummyVirtualFunctionToHinderLinkerICF() const;
     };
 
     class ScriptFunction : public ScriptFunctionBase