1 files changed, 9 insertions, 12 deletions
diff --git a/prism/templates/ext/prism/api_node.c.erb b/prism/templates/ext/prism/api_node.c.erb
index 0e8aaae322..0e3e4d63cc 100644
--- a/prism/templates/ext/prism/api_node.c.erb
+++ b/prism/templates/ext/prism/api_node.c.erb
@@ -76,8 +76,7 @@ pm_source_new(const pm_parser_t *parser, rb_encoding *encoding) {
         rb_ary_push(offsets, ULONG2NUM(parser->newline_list.offsets[index]));
     }
 
-    VALUE source_argv[] = { source_string, LONG2NUM(parser->start_line), offsets };
-    return rb_class_new_instance(3, source_argv, rb_cPrismSource);
+    return rb_funcall(rb_cPrismSource, rb_intern("for"), 3, source_string, LONG2NUM(parser->start_line), offsets);
 }
 
 typedef struct pm_node_stack_node {
@@ -108,21 +107,21 @@ pm_node_stack_pop(pm_node_stack_node_t **stack) {
 
 VALUE
 pm_ast_new(const pm_parser_t *parser, const pm_node_t *node, rb_encoding *encoding, VALUE source) {
-    ID *constants = xcalloc(parser->constant_pool.size, sizeof(ID));
+    VALUE constants = rb_ary_new_capa(parser->constant_pool.size);
 
     for (uint32_t index = 0; index < parser->constant_pool.size; index++) {
         pm_constant_t *constant = &parser->constant_pool.constants[index];
         int state = 0;
 
         VALUE string = rb_enc_str_new((const char *) constant->start, constant->length, encoding);
-        ID value = rb_protect(rb_intern_str, string, &state);
+        VALUE value = rb_protect(rb_str_intern, string, &state);
 
         if (state != 0) {
-            value = rb_intern_const("?");
+            value = ID2SYM(rb_intern_const("?"));
             rb_set_errinfo(Qnil);
         }
 
-        constants[index] = value;
+        rb_ary_push(constants, value);
     }
 
     pm_node_stack_node_t *node_stack = NULL;
@@ -197,15 +196,15 @@ pm_ast_new(const pm_parser_t *parser, const pm_node_t *node, rb_encoding *encodi
                     <%- when Prism::Template::ConstantField -%>
 #line <%= __LINE__ + 1 %> "<%= File.basename(__FILE__) %>"
                     assert(cast-><%= field.name %> != 0);
-                    argv[<%= index %>] = rb_id2sym(constants[cast-><%= field.name %> - 1]);
+                    argv[<%= index %>] = RARRAY_AREF(constants, cast-><%= field.name %> - 1);
                     <%- when Prism::Template::OptionalConstantField -%>
-                    argv[<%= index %>] = cast-><%= field.name %> == 0 ? Qnil : rb_id2sym(constants[cast-><%= field.name %> - 1]);
+                    argv[<%= index %>] = cast-><%= field.name %> == 0 ? Qnil : RARRAY_AREF(constants, cast-><%= field.name %> - 1);
                     <%- when Prism::Template::ConstantListField -%>
 #line <%= __LINE__ + 1 %> "<%= File.basename(__FILE__) %>"
                     argv[<%= index %>] = rb_ary_new_capa(cast-><%= field.name %>.size);
                     for (size_t index = 0; index < cast-><%= field.name %>.size; index++) {
                         assert(cast-><%= field.name %>.ids[index] != 0);
-                        rb_ary_push(argv[<%= index %>], rb_id2sym(constants[cast-><%= field.name %>.ids[index] - 1]));
+                        rb_ary_push(argv[<%= index %>], RARRAY_AREF(constants, cast-><%= field.name %>.ids[index] - 1));
                     }
                     <%- when Prism::Template::LocationField -%>
 #line <%= __LINE__ + 1 %> "<%= File.basename(__FILE__) %>"
@@ -246,9 +245,7 @@ pm_ast_new(const pm_parser_t *parser, const pm_node_t *node, rb_encoding *encodi
         }
     }
 
-    VALUE result = rb_ary_pop(value_stack);
-    xfree(constants);
-    return result;
+    return rb_ary_pop(value_stack);
 }
 
 void