[MERGE #5974 @MikeHolman] Fix ChakraFull build break

MikeHolman · MikeHolman · commit 366d49c849ad · 2019-02-26T11:07:46.000-08:00
Merge pull request #5974 from MikeHolman:fixbuild trace callback isn't defined in chakrafull, so remove reference to it
diff --git a/lib/Jsrt/JsrtExternalObject.cpp b/lib/Jsrt/JsrtExternalObject.cpp
@@ -163,18 +163,19 @@ JsrtExternalObject* JsrtExternalObject::Copy(bool deepCopy)
     JsrtExternalType* type = this->GetExternalType();
     int inlineSlotSize = this->GetInlineSlotSize();
 
+#ifdef _CHAKRACOREBUILD
     if (type->GetJsTraceCallback() != nullptr)
     {
         return RecyclerNewTrackedPlus(recycler, inlineSlotSize, JsrtExternalObject, this, deepCopy);
     }
-    else if (type->GetJsFinalizeCallback() != nullptr)
+#endif
+
+    if (type->GetJsFinalizeCallback() != nullptr)
     {
         return RecyclerNewFinalizedPlus(recycler, inlineSlotSize, JsrtExternalObject, this, deepCopy);
     }
-    else
-    {
-        return RecyclerNewPlus(recycler, inlineSlotSize, JsrtExternalObject, this, deepCopy);
-    }
+
+    return RecyclerNewPlus(recycler, inlineSlotSize, JsrtExternalObject, this, deepCopy);
 }
 
 void JsrtExternalObject::Mark(Recycler * recycler) 

Original file line number	Diff line number	Diff line change
`@@ -163,18 +163,19 @@ JsrtExternalObject* JsrtExternalObject::Copy(bool deepCopy)`
`163`	`163`	`JsrtExternalType* type = this->GetExternalType();`
`164`	`164`	`int inlineSlotSize = this->GetInlineSlotSize();`
`165`	`165`
	`166`	`+#ifdef _CHAKRACOREBUILD`
`166`	`167`	`if (type->GetJsTraceCallback() != nullptr)`
`167`	`168`	`{`
`168`	`169`	`return RecyclerNewTrackedPlus(recycler, inlineSlotSize, JsrtExternalObject, this, deepCopy);`
`169`	`170`	`}`
`170`		`- else if (type->GetJsFinalizeCallback() != nullptr)`
	`171`	`+#endif`
	`172`	`+`
	`173`	`+ if (type->GetJsFinalizeCallback() != nullptr)`
`171`	`174`	`{`
`172`	`175`	`return RecyclerNewFinalizedPlus(recycler, inlineSlotSize, JsrtExternalObject, this, deepCopy);`
`173`	`176`	`}`
`174`		`- else`
`175`		`- {`
`176`		`- return RecyclerNewPlus(recycler, inlineSlotSize, JsrtExternalObject, this, deepCopy);`
`177`		`- }`
	`177`	`+`
	`178`	`+ return RecyclerNewPlus(recycler, inlineSlotSize, JsrtExternalObject, this, deepCopy);`
`178`	`179`	`}`
`179`	`180`
`180`	`181`	`void JsrtExternalObject::Mark(Recycler * recycler)`