src: create per-isolate strings after platform setup

Allocation of strings may cause a garbage collection that uses the platform to post tasks. PR-URL: #20175 Fixes: #20171 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Tiancheng "Timothy" Gu <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Yang Guo <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Daniel Bevenius <[email protected]>
nodejs · Jun 29, 2018 · c06a41e · c06a41e
1 parent 427124a
commit c06a41e
Showing 1 changed file with 34 additions and 32 deletions.
diff --git a/src/env.cc b/src/env.cc
@@ -30,44 +30,46 @@ IsolateData::IsolateData(Isolate* isolate,
                          uv_loop_t* event_loop,
                          MultiIsolatePlatform* platform,
                          uint32_t* zero_fill_field) :
-
-// Create string and private symbol properties as internalized one byte strings.
-//
-// Internalized because it makes property lookups a little faster and because
-// the string is created in the old space straight away.  It's going to end up
-// in the old space sooner or later anyway but now it doesn't go through
-// v8::Eternal's new space handling first.
-//
-// One byte because our strings are ASCII and we can safely skip V8's UTF-8
-// decoding step.  It's a one-time cost, but why pay it when you don't have to?
-#define V(PropertyName, StringValue)                                          \
-    PropertyName ## _(                                                        \
-        isolate,                                                              \
-        Private::New(                                                         \
-            isolate,                                                          \
-            String::NewFromOneByte(                                           \
-                isolate,                                                      \
-                reinterpret_cast<const uint8_t*>(StringValue),                \
-                v8::NewStringType::kInternalized,                             \
-                sizeof(StringValue) - 1).ToLocalChecked())),
-  PER_ISOLATE_PRIVATE_SYMBOL_PROPERTIES(V)
-#undef V
-#define V(PropertyName, StringValue)                                          \
-    PropertyName ## _(                                                        \
-        isolate,                                                              \
-        String::NewFromOneByte(                                               \
-            isolate,                                                          \
-            reinterpret_cast<const uint8_t*>(StringValue),                    \
-            v8::NewStringType::kInternalized,                                 \
-            sizeof(StringValue) - 1).ToLocalChecked()),
-    PER_ISOLATE_STRING_PROPERTIES(V)
-#undef V
     isolate_(isolate),
     event_loop_(event_loop),
     zero_fill_field_(zero_fill_field),
     platform_(platform) {
   if (platform_ != nullptr)
     platform_->RegisterIsolate(this, event_loop);
+
+  // Create string and private symbol properties as internalized one byte
+  // strings after the platform is properly initialized.
+  //
+  // Internalized because it makes property lookups a little faster and
+  // because the string is created in the old space straight away.  It's going
+  // to end up in the old space sooner or later anyway but now it doesn't go
+  // through v8::Eternal's new space handling first.
+  //
+  // One byte because our strings are ASCII and we can safely skip V8's UTF-8
+  // decoding step.
+
+#define V(PropertyName, StringValue)                                        \
+    PropertyName ## _.Set(                                                  \
+        isolate,                                                            \
+        Private::New(                                                       \
+            isolate,                                                        \
+            String::NewFromOneByte(                                         \
+                isolate,                                                    \
+                reinterpret_cast<const uint8_t*>(StringValue),              \
+                v8::NewStringType::kInternalized,                           \
+                sizeof(StringValue) - 1).ToLocalChecked()));
+  PER_ISOLATE_PRIVATE_SYMBOL_PROPERTIES(V)
+#undef V
+#define V(PropertyName, StringValue)                                        \
+    PropertyName ## _.Set(                                                  \
+        isolate,                                                            \
+        String::NewFromOneByte(                                             \
+            isolate,                                                        \
+            reinterpret_cast<const uint8_t*>(StringValue),                  \
+            v8::NewStringType::kInternalized,                               \
+            sizeof(StringValue) - 1).ToLocalChecked());
+  PER_ISOLATE_STRING_PROPERTIES(V)
+#undef V
 }
 
 IsolateData::~IsolateData() {