[Truffle] Parametrize AtomicReference in the OM DSL.

jruby · Aug 19, 2015 · 36c9f5d · 36c9f5d
1 parent bf77585
commit 36c9f5d
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/om/dsl/processor/layout/LayoutGenerator.java b/truffle/src/main/java/org/jruby/truffle/om/dsl/processor/layout/LayoutGenerator.java
@@ -449,7 +449,7 @@ public void run(PropertyModel property, boolean last) {
                         } else if (property.getType().getKind() == TypeKind.BOOLEAN) {
                             stream.printf("            new AtomicBoolean(%s)", property.getName());
                         } else {
-                            stream.printf("            new AtomicReference(%s)", property.getName());
+                            stream.printf("            new AtomicReference<%s>(%s)", property.getType(), property.getName());
                         }
                     } else {
                         stream.printf("            %s", property.getName());
@@ -513,7 +513,7 @@ public void run(PropertyModel property, boolean last) {
                         } else if (property.getType().getKind() == TypeKind.BOOLEAN) {
                             stream.printf("            new AtomicBoolean(%s)", property.getName());
                         } else {
-                            stream.printf("            new AtomicReference(%s)", property.getName());
+                            stream.printf("            new AtomicReference<%s>(%s)", property.getType(), property.getName());
                         }
                     } else {
                         stream.printf("            %s", property.getName());
@@ -606,7 +606,7 @@ public void run(PropertyModel property, boolean last) {
                         } else if (property.getType().getKind() == TypeKind.BOOLEAN) {
                             stream.printf("        return ((AtomicBoolean) %s_PROPERTY.get(object, true)).get();\n", NameUtils.identifierToConstant(property.getName()));
                         } else {
-                            stream.printf("        return (%s) ((AtomicReference) %s_PROPERTY.get(object, true)).get();\n", property.getType(), NameUtils.identifierToConstant(property.getName()));
+                            stream.printf("        return ((AtomicReference<%s>) %s_PROPERTY.get(object, true)).get();\n", property.getType(), NameUtils.identifierToConstant(property.getName()));
                         }
                     } else {
                         stream.printf("        return (%s) %s_PROPERTY.get(object, true);\n", property.getType(), NameUtils.identifierToConstant(property.getName()));
@@ -669,7 +669,7 @@ public void run(PropertyModel property, boolean last) {
                         } else if (property.getType().getKind() == TypeKind.BOOLEAN) {
                             stream.printf("        ((AtomicBoolean) %s_PROPERTY.get(object, true)).set(value);\n", NameUtils.identifierToConstant(property.getName()));
                         } else {
-                            stream.printf("        ((AtomicReference) %s_PROPERTY.get(object, true)).set(value);\n", NameUtils.identifierToConstant(property.getName()));
+                            stream.printf("        ((AtomicReference<%s>) %s_PROPERTY.get(object, true)).set(value);\n", property.getType(), NameUtils.identifierToConstant(property.getName()));
                         }
                     } else {
                         stream.printf("        try {\n");