Revert "Add thread safety to property macros with lazy initializers (#15548)" (#15557)

This reverts commit 4d0306e.

Author: straight-shoota

scripts/generate_object_properties.cr

@@ -66,42 +66,20 @@ struct Generator
   end
 
   def def_getter(suffix = "")
-    if @macro_prefix == "class_"
-      <<-TEXT
-            {% if block %} @@__{{var_name}}_flag = false {% end %}
-
-            def self.{{var_name}}#{suffix} {% if type %} : {{type}} {% end %}
-              {% if block %}
-                if (%value = @@{{var_name}}).nil?
-                  ::Crystal.once(pointerof(@@__{{var_name}}_flag)) do
-                    @@{{var_name}} = {{yield}} if @@{{var_name}}.nil?
-                  end
-                  @@{{var_name}}.not_nil!
-                else
-                  %value
-                end
-              {% else %}
-                @@{{var_name}}
-              {% end %}
-            end
-
-      TEXT
-    else
-      <<-TEXT
-            def {{var_name}}#{suffix} {% if type %} : {{type}} {% end %}
-              {% if block %}
-                if (%value = @{{var_name}}).nil?
-                  @{{var_name}} = {{yield}}
-                else
-                  %value
-                end
-              {% else %}
-                @{{var_name}}
-              {% end %}
-            end
+    <<-TEXT
+          def #{@method_prefix}{{var_name}}#{suffix} {% if type %} : {{type}} {% end %}
+            {% if block %}
+              if (%value = #{@var_prefix}{{var_name}}).nil?
+                #{@var_prefix}{{var_name}} = {{yield}}
+              else
+                %value
+              end
+            {% else %}
+              #{@var_prefix}{{var_name}}
+            {% end %}
+          end
 
-      TEXT
-    end
+    TEXT
   end
 
   def def_getter!

src/object/properties.cr

@@ -334,15 +334,10 @@ class Object
         {% type = nil %}
       {% end %}
 
-      {% if block %} @@__{{var_name}}_flag = false {% end %}
-
       def self.{{var_name}} {% if type %} : {{type}} {% end %}
         {% if block %}
           if (%value = @@{{var_name}}).nil?
-            ::Crystal.once(pointerof(@@__{{var_name}}_flag)) do
-              @@{{var_name}} = {{yield}} if @@{{var_name}}.nil?
-            end
-            @@{{var_name}}.not_nil!
+            @@{{var_name}} = {{yield}}
           else
             %value
           end
@@ -394,15 +389,10 @@ class Object
         {% type = nil %}
       {% end %}
 
-      {% if block %} @@__{{var_name}}_flag = false {% end %}
-
       def self.{{var_name}}? {% if type %} : {{type}} {% end %}
         {% if block %}
           if (%value = @@{{var_name}}).nil?
-            ::Crystal.once(pointerof(@@__{{var_name}}_flag)) do
-              @@{{var_name}} = {{yield}} if @@{{var_name}}.nil?
-            end
-            @@{{var_name}}.not_nil!
+            @@{{var_name}} = {{yield}}
           else
             %value
           end
@@ -538,15 +528,10 @@ class Object
         {% type = nil %}
       {% end %}
 
-      {% if block %} @@__{{var_name}}_flag = false {% end %}
-
       def self.{{var_name}} {% if type %} : {{type}} {% end %}
         {% if block %}
           if (%value = @@{{var_name}}).nil?
-            ::Crystal.once(pointerof(@@__{{var_name}}_flag)) do
-              @@{{var_name}} = {{yield}} if @@{{var_name}}.nil?
-            end
-            @@{{var_name}}.not_nil!
+            @@{{var_name}} = {{yield}}
           else
             %value
           end
@@ -584,15 +569,10 @@ class Object
         {% type = nil %}
       {% end %}
 
-      {% if block %} @@__{{var_name}}_flag = false {% end %}
-
       def self.{{var_name}}? {% if type %} : {{type}} {% end %}
         {% if block %}
           if (%value = @@{{var_name}}).nil?
-            ::Crystal.once(pointerof(@@__{{var_name}}_flag)) do
-              @@{{var_name}} = {{yield}} if @@{{var_name}}.nil?
-            end
-            @@{{var_name}}.not_nil!
+            @@{{var_name}} = {{yield}}
           else
             %value
           end

src/prelude.cr

@@ -11,7 +11,6 @@
 require "lib_c"
 require "macros"
 require "object"
-require "crystal/main"
 require "crystal/once"
 require "comparable"
 require "exception"
@@ -35,6 +34,7 @@ require "char/reader"
 require "class"
 require "concurrent"
 require "crystal/compiler_rt"
+require "crystal/main"
 require "deque"
 require "dir"
 require "enum"