Merge pull request HaxeFoundation#858 from RobDangerous/master

hughsando · web-flow · commit ba4019d5e171 · 2019-10-14T08:02:03.000+08:00
Add write barriers to fixed anon constructors
diff --git a/include/hx/Anon.h b/include/hx/Anon.h
@@ -81,10 +81,10 @@ class HXCPP_EXTERN_CLASS_ATTRIBUTES Anon_obj : public hx::Object
       fixed->key = inName;
       fixed->value = inValue;
       if (inValue.type == ::cpp::Variant::typeObject) {
-        HX_OBJ_WB_GET(this, hx::PointerOf(inValue.valObject));
+        HX_OBJ_WB_GET(this, inValue.valObject);
       }
       else if (inValue.type == ::cpp::Variant::typeString) {
-        HX_OBJ_WB_GET(this, hx::PointerOf(inValue.valStringPtr));
+        HX_OBJ_WB_GET(this, inValue.valStringPtr);
       }
       return this;
    }
@@ -163,6 +163,9 @@ class AnonStruct1_obj : public hx::Object
    {
       AnonStruct1_obj *result = new AnonStruct1_obj;
       result->name0 = inName0; result->t0 = inT0;
+      if (hx::ContainsPointers<_hx_T0>()) {
+        HX_OBJ_WB_GET(result, hx::PointerOf(inT0));
+      }
       return result;
    }
    hx::Val __Field(const String &inField, hx::PropertyAccess)
@@ -218,7 +221,13 @@ class AnonStruct2_obj : public hx::Object
    {
       AnonStruct2_obj *result = new AnonStruct2_obj;
       result->name0 = inName0; result->t0 = inT0;
+      if (hx::ContainsPointers<_hx_T0>()) {
+        HX_OBJ_WB_GET(result, hx::PointerOf(inT0));
+      }
       result->name1 = inName1; result->t1 = inT1;
+      if (hx::ContainsPointers<_hx_T1>()) {
+        HX_OBJ_WB_GET(result, hx::PointerOf(inT1));
+      }
       return result;
    }
    hx::Val __Field(const String &inField, hx::PropertyAccess)
@@ -288,8 +297,17 @@ class AnonStruct3_obj : public hx::Object
    {
       AnonStruct3_obj *result = new AnonStruct3_obj;
       result->name0 = inName0; result->t0 = inT0;
+      if (hx::ContainsPointers<_hx_T0>()) {
+        HX_OBJ_WB_GET(result, hx::PointerOf(inT0));
+      }
       result->name1 = inName1; result->t1 = inT1;
+      if (hx::ContainsPointers<_hx_T1>()) {
+        HX_OBJ_WB_GET(result, hx::PointerOf(inT1));
+      }
       result->name2 = inName2; result->t2 = inT2;
+      if (hx::ContainsPointers<_hx_T2>()) {
+        HX_OBJ_WB_GET(result, hx::PointerOf(inT2));
+      }
       return result;
    }
    hx::Val __Field(const String &inField, hx::PropertyAccess)
@@ -371,9 +389,21 @@ class AnonStruct4_obj : public hx::Object
    {
       AnonStruct4_obj *result = new AnonStruct4_obj;
       result->name0 = inName0; result->t0 = inT0;
+      if (hx::ContainsPointers<_hx_T0>()) {
+        HX_OBJ_WB_GET(result, hx::PointerOf(inT0));
+      }
       result->name1 = inName1; result->t1 = inT1;
+      if (hx::ContainsPointers<_hx_T1>()) {
+        HX_OBJ_WB_GET(result, hx::PointerOf(inT1));
+      }
       result->name2 = inName2; result->t2 = inT2;
+      if (hx::ContainsPointers<_hx_T2>()) {
+        HX_OBJ_WB_GET(result, hx::PointerOf(inT2));
+      }
       result->name3 = inName3; result->t3 = inT3;
+      if (hx::ContainsPointers<_hx_T3>()) {
+        HX_OBJ_WB_GET(result, hx::PointerOf(inT3));
+      }
       return result;
    }
    hx::Val __Field(const String &inField, hx::PropertyAccess)
@@ -470,10 +500,25 @@ class AnonStruct5_obj : public hx::Object
    {
       AnonStruct5_obj *result = new AnonStruct5_obj;
       result->name0 = inName0; result->t0 = inT0;
+      if (hx::ContainsPointers<_hx_T0>()) {
+        HX_OBJ_WB_GET(result, hx::PointerOf(inT0));
+      }
       result->name1 = inName1; result->t1 = inT1;
+      if (hx::ContainsPointers<_hx_T1>()) {
+        HX_OBJ_WB_GET(result, hx::PointerOf(inT1));
+      }
       result->name2 = inName2; result->t2 = inT2;
+      if (hx::ContainsPointers<_hx_T2>()) {
+        HX_OBJ_WB_GET(result, hx::PointerOf(inT2));
+      }
       result->name3 = inName3; result->t3 = inT3;
+      if (hx::ContainsPointers<_hx_T3>()) {
+        HX_OBJ_WB_GET(result, hx::PointerOf(inT3));
+      }
       result->name4 = inName4; result->t4 = inT4;
+      if (hx::ContainsPointers<_hx_T4>()) {
+        HX_OBJ_WB_GET(result, hx::PointerOf(inT4));
+      }
       return result;
    }
    hx::Val __Field(const String &inField, hx::PropertyAccess)
