Addressing comments

chakra-core · May 10, 2016 · cb0ae86 · cb0ae86
1 parent a596859
commit cb0ae86
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 54 deletions.
diff --git a/lib/Backend/Lower.cpp b/lib/Backend/Lower.cpp
@@ -12174,14 +12174,11 @@ Lowerer::GenerateBailOut(IR::Instr * instr, IR::BranchInstr * branchInstr, IR::L
     }
 
     // Add helper label to trigger layout.
-    if (collectRuntimeStatsLabel)
-    {
-        collectRuntimeStatsLabel->Unlink();
-    }
-    else
+    if (!collectRuntimeStatsLabel)
     {
         collectRuntimeStatsLabel = IR::LabelInstr::New(Js::OpCode::Label, this->m_func, true);
     }
+    Assert(!collectRuntimeStatsLabel->IsLinked());
     instr->InsertBefore(collectRuntimeStatsLabel);
 
     if (bailOutInstr != instr)

diff --git a/lib/Backend/LowerMDShared.cpp b/lib/Backend/LowerMDShared.cpp
@@ -8849,17 +8849,7 @@ void LowererMD::GenerateFastInlineBuiltInCall(IR::Instr* instr, IR::JnHelperMeth
             if (instr->GetDst()->IsInt32())
             {
                 sharedBailout = (instr->GetBailOutInfo()->bailOutInstr != instr) ? true : false;
-                if (sharedBailout)
-                {
-                    // In case of a shared bailout, we should jump to the code that sets some data on the 
-                    // bailout record which is specific to this bailout.
-                    bailoutLabel = IR::LabelInstr::New(Js::OpCode::Label, this->m_func, /*helperLabel*/true);
-                    instr->GetBailOutInfo()->bailOutInstr->AsLabelInstr()->InsertBefore(bailoutLabel);
-                }
-                else
-                {
-                    bailoutLabel = IR::LabelInstr::New(Js::OpCode::Label, this->m_func, /*helperLabel*/true);
-                }
+                bailoutLabel = IR::LabelInstr::New(Js::OpCode::Label, this->m_func, /*helperLabel*/true);
             }
 
             IR::Opnd * zero;
@@ -9074,6 +9064,9 @@ void LowererMD::GenerateFastInlineBuiltInCall(IR::Instr* instr, IR::JnHelperMeth
                 {
                     instr->InsertBefore(bailoutLabel);
                 }
+
+                // In case of a shared bailout, we should jump to the code that sets some data on the bailout record which is specific
+                // to this bailout. Pass the bailoutLabel to GenerateFunction so that it may use the label as the collectRuntimeStatsLabel.
                 this->m_lowerer->GenerateBailOut(instr, nullptr, nullptr, sharedBailout ? bailoutLabel : nullptr);
             }
             else

diff --git a/lib/Backend/arm/LowerMD.cpp b/lib/Backend/arm/LowerMD.cpp
@@ -8399,20 +8399,9 @@ LowererMD::GenerateFastInlineBuiltInMathFloor(IR::Instr* instr)
     IR::RegOpnd* floatOpnd = IR::RegOpnd::New(TyFloat64, this->m_func);
     this->m_lowerer->InsertMove(floatOpnd, src, instr);
 
-    IR::LabelInstr * bailoutLabel;
+    IR::LabelInstr * bailoutLabel = IR::LabelInstr::New(Js::OpCode::Label, this->m_func, /*helperLabel*/true);;
     bool sharedBailout = (instr->GetBailOutInfo()->bailOutInstr != instr) ? true : false;
-    if(sharedBailout)
-    {
-        // In case of a shared bailout, we should jump to the code that sets some data on the 
-        // bailout record which is specific to this bailout.
-        bailoutLabel = IR::LabelInstr::New(Js::OpCode::Label, this->m_func, /*helperLabel*/true);
-        instr->GetBailOutInfo()->bailOutInstr->AsLabelInstr()->InsertBefore(bailoutLabel);
-    }
-    else
-    {
-        bailoutLabel = IR::LabelInstr::New(Js::OpCode::Label, this->m_func, true);
-    }
-
+
     // NaN check
     IR::Instr *instrCmp = IR::Instr::New(Js::OpCode::VCMPF64, this->m_func);
     instrCmp->SetSrc1(floatOpnd);
@@ -8484,6 +8473,9 @@ LowererMD::GenerateFastInlineBuiltInMathFloor(IR::Instr* instr)
     {
         instr->InsertBefore(bailoutLabel);
     }
+
+    // In case of a shared bailout, we should jump to the code that sets some data on the bailout record which is specific
+    // to this bailout. Pass the bailoutLabel to GenerateFunction so that it may use the label as the collectRuntimeStatsLabel.
     this->m_lowerer->GenerateBailOut(instr, nullptr, nullptr, sharedBailout ? bailoutLabel : nullptr);
 
     // MOV dst, intOpnd
@@ -8505,19 +8497,8 @@ LowererMD::GenerateFastInlineBuiltInMathCeil(IR::Instr* instr)
     IR::RegOpnd* floatOpnd = IR::RegOpnd::New(TyFloat64, this->m_func);
     this->m_lowerer->InsertMove(floatOpnd, src, instr);
 
-    IR::LabelInstr * bailoutLabel;
+    IR::LabelInstr * bailoutLabel = IR::LabelInstr::New(Js::OpCode::Label, this->m_func, /*helperLabel*/true);;
     bool sharedBailout = (instr->GetBailOutInfo()->bailOutInstr != instr) ? true : false;
-    if(sharedBailout)
-    {
-        // In case of a shared bailout, we should jump to the code that sets some data on the 
-        // bailout record which is specific to this bailout.
-        bailoutLabel = IR::LabelInstr::New(Js::OpCode::Label, this->m_func, /*helperLabel*/true);
-        instr->GetBailOutInfo()->bailOutInstr->AsLabelInstr()->InsertBefore(bailoutLabel);
-    }
-    else
-    {
-        bailoutLabel = IR::LabelInstr::New(Js::OpCode::Label, this->m_func, true);
-    }
 
     // NaN check
     IR::Instr *instrCmp = IR::Instr::New(Js::OpCode::VCMPF64, this->m_func);
@@ -8595,6 +8576,9 @@ LowererMD::GenerateFastInlineBuiltInMathCeil(IR::Instr* instr)
     {
         instr->InsertBefore(bailoutLabel);
     }
+
+    // In case of a shared bailout, we should jump to the code that sets some data on the bailout record which is specific
+    // to this bailout. Pass the bailoutLabel to GenerateFunction so that it may use the label as the collectRuntimeStatsLabel.
     this->m_lowerer->GenerateBailOut(instr, nullptr, nullptr, sharedBailout ? bailoutLabel : nullptr);
 
     // MOV dst, intOpnd
@@ -8616,20 +8600,9 @@ LowererMD::GenerateFastInlineBuiltInMathRound(IR::Instr* instr)
     IR::RegOpnd* floatOpnd = IR::RegOpnd::New(TyFloat64, this->m_func);
     this->m_lowerer->InsertMove(floatOpnd, src, instr);
 
-    IR::LabelInstr * bailoutLabel;
+    IR::LabelInstr * bailoutLabel = IR::LabelInstr::New(Js::OpCode::Label, this->m_func, /*helperLabel*/true);;
     bool sharedBailout = (instr->GetBailOutInfo()->bailOutInstr != instr) ? true : false;
-    if(sharedBailout)
-    {
-        // In case of a shared bailout, we should jump to the code that sets some data on the 
-        // bailout record which is specific to this bailout.
-        bailoutLabel = IR::LabelInstr::New(Js::OpCode::Label, this->m_func, /*helperLabel*/true);
-        instr->GetBailOutInfo()->bailOutInstr->AsLabelInstr()->InsertBefore(bailoutLabel);
-    }
-    else
-    {
-        bailoutLabel = IR::LabelInstr::New(Js::OpCode::Label, this->m_func, true);
-    }
-
+
     // NaN check
     IR::Instr *instrCmp = IR::Instr::New(Js::OpCode::VCMPF64, this->m_func);
     instrCmp->SetSrc1(floatOpnd);
@@ -8710,6 +8683,9 @@ LowererMD::GenerateFastInlineBuiltInMathRound(IR::Instr* instr)
     {
         instr->InsertBefore(bailoutLabel);
     }
+
+    // In case of a shared bailout, we should jump to the code that sets some data on the bailout record which is specific
+    // to this bailout. Pass the bailoutLabel to GenerateFunction so that it may use the label as the collectRuntimeStatsLabel.
     this->m_lowerer->GenerateBailOut(instr, nullptr, nullptr, sharedBailout ? bailoutLabel : nullptr);
 
     // MOV dst, intOpnd