From 5abce7ec081579b0334bc1c0b43d8618c861d0e5 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 23 Oct 2019 09:25:14 -0700
Subject: [PATCH] fix: call InitializeContextRuntime in InitializeContext
 (#20684)

---
 patches/node/.patches                         |  1 +
 ...econtextruntime_in_initializecontext.patch | 31 +++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 patches/node/fix_call_initializecontextruntime_in_initializecontext.patch

diff --git a/patches/node/.patches b/patches/node/.patches
index b94e15a8706a..bf3b16e95ccf 100644
--- a/patches/node/.patches
+++ b/patches/node/.patches
@@ -41,3 +41,4 @@ revert_crypto_add_oaeplabel_option.patch
 fix_windows_compilation_on_libuv_setsockopt.patch
 fix_don_t_use_node-controlled_preparestacktrace.patch
 fix_remove_uses_of_node_use_v8_platform.patch
+fix_call_initializecontextruntime_in_initializecontext.patch
diff --git a/patches/node/fix_call_initializecontextruntime_in_initializecontext.patch b/patches/node/fix_call_initializecontextruntime_in_initializecontext.patch
new file mode 100644
index 000000000000..23b1ce1f92f7
--- /dev/null
+++ b/patches/node/fix_call_initializecontextruntime_in_initializecontext.patch
@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shelley Vohr <shelley.vohr@gmail.com>
+Date: Tue, 22 Oct 2019 11:00:01 -0700
+Subject: fix: call InitializeContextRuntime in InitializeContext
+
+
+diff --git a/src/api/environment.cc b/src/api/environment.cc
+index 50886f4a998f1e7f346a6b7fad91ce49c3a7cdff..6ec07527ad7a806f889d884507e9def1cf68b4c8 100644
+--- a/src/api/environment.cc
++++ b/src/api/environment.cc
+@@ -371,8 +371,6 @@ Local<Context> NewContext(Isolate* isolate,
+     return Local<Context>();
+   }
+ 
+-  InitializeContextRuntime(context);
+-
+   return context;
+ }
+ 
+@@ -457,6 +455,11 @@ bool InitializeContext(Local<Context> context) {
+     }
+   }
+ 
++  // This must be called here because embedders don't necessarily run
++  // NewContext, so when InitializeContext is called this might never
++  // otherwise be called
++  InitializeContextRuntime(context);
++
+   return true;
+ }
+