From 591de3e2788ff89bc68e021cf351f8e170f51089 Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Fri, 17 Feb 2017 05:55:43 -0800
Subject: [PATCH] Move tryBytecode to bundle specifier

Reviewed By: amnn

Differential Revision: D4559898

fbshipit-source-id: 917bef5a1d753b52e9e967f3029eb158935feee6
---
 React/Executors/RCTJSCExecutor.h  | 17 +----------------
 React/Executors/RCTJSCExecutor.mm | 16 +---------------
 2 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/React/Executors/RCTJSCExecutor.h b/React/Executors/RCTJSCExecutor.h
index c988b5b44..afec28e44 100644
--- a/React/Executors/RCTJSCExecutor.h
+++ b/React/Executors/RCTJSCExecutor.h
@@ -73,15 +73,6 @@ RCT_EXTERN NSString *const RCTFBJSValueClassKey;
  */
 - (instancetype)initWithUseCustomJSCLibrary:(BOOL)useCustomJSCLibrary;
 
-/**
- * @experimental
- * Inits a new executor instance with given configuration flags. Please refer to
- * the documentation for `RCTJSContextProvider` for more information as to their
- * purpose.
- */
-- (instancetype)initWithUseCustomJSCLibrary:(BOOL)useCustomJSCLibrary
-                                tryBytecode:(BOOL)tryBytecode;
-
 /**
  * @experimental
  * synchronouslyExecuteApplicationScript:sourceURL:JSContext:error:
@@ -118,19 +109,13 @@ RCT_EXTERN NSString *const RCTFBJSValueClassKey;
  */
 @interface RCTJSContextProvider : NSObject
 
-- (instancetype)initWithUseCustomJSCLibrary:(BOOL)useCustomJSCLibrary
-                                tryBytecode:(BOOL)tryBytecode;
+- (instancetype)initWithUseCustomJSCLibrary:(BOOL)useCustomJSCLibrary;
 
 /**
  * Marks whether the provider uses the custom implementation of JSC and not the system one.
  */
 @property (nonatomic, readonly, assign) BOOL useCustomJSCLibrary;
 
-/**
- * Marks whether it is safe to try and run bytecode if given the choice.
- */
-@property (nonatomic, readonly) BOOL tryBytecode;
-
 /**
  * @experimental
  * Create an RCTJSCExecutor from an provider instance. This may only be called once.
diff --git a/React/Executors/RCTJSCExecutor.mm b/React/Executors/RCTJSCExecutor.mm
index 5ce5fb2f0..92918feb6 100644
--- a/React/Executors/RCTJSCExecutor.mm
+++ b/React/Executors/RCTJSCExecutor.mm
@@ -84,7 +84,6 @@ struct TaggedScript {
 
 struct RCTJSContextData {
   BOOL useCustomJSCLibrary;
-  BOOL tryBytecode;
   NSThread *javaScriptThread;
   JSContext *context;
 };
@@ -150,7 +149,6 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
 {
   // Set at init time:
   BOOL _useCustomJSCLibrary;
-  BOOL _tryBytecode;
   NSThread *_javaScriptThread;
 
   // Set at setUp time:
@@ -229,19 +227,11 @@ static NSThread *newJavaScriptThread(void)
 }
 
 - (instancetype)initWithUseCustomJSCLibrary:(BOOL)useCustomJSCLibrary
-{
-  return [self initWithUseCustomJSCLibrary:useCustomJSCLibrary
-                               tryBytecode:NO];
-}
-
-- (instancetype)initWithUseCustomJSCLibrary:(BOOL)useCustomJSCLibrary
-                                tryBytecode:(BOOL)tryBytecode
 {
   RCT_PROFILE_BEGIN_EVENT(0, @"-[RCTJSCExecutor init]", nil);
 
   if (self = [super init]) {
     _useCustomJSCLibrary = useCustomJSCLibrary;
-    _tryBytecode = tryBytecode;
     _valid = YES;
     _javaScriptThread = newJavaScriptThread();
   }
@@ -254,7 +244,6 @@ static NSThread *newJavaScriptThread(void)
 {
   if (self = [super init]) {
     _useCustomJSCLibrary = data.useCustomJSCLibrary;
-    _tryBytecode = data.tryBytecode;
     _valid = YES;
     _javaScriptThread = data.javaScriptThread;
     _context = [[RCTJavaScriptContext alloc] initWithJSContext:data.context onThread:_javaScriptThread];
@@ -531,7 +520,7 @@ static void installBasicSynchronousHooksOnContext(JSContext *context)
 
 - (int32_t)bytecodeFileFormatVersion
 {
-  return (_useCustomJSCLibrary && _tryBytecode)
+  return _useCustomJSCLibrary
     ? facebook::react::customJSCWrapper()->JSBytecodeFileFormatVersion
     : JSNoBytecodeFileFormatVersion;
 }
@@ -998,12 +987,10 @@ static NSData *loadRAMBundle(NSURL *sourceURL, NSError **error, RandomAccessBund
 }
 
 - (instancetype)initWithUseCustomJSCLibrary:(BOOL)useCustomJSCLibrary
-                                tryBytecode:(BOOL)tryBytecode
 {
   if (self = [super init]) {
     _semaphore = dispatch_semaphore_create(0);
     _useCustomJSCLibrary = useCustomJSCLibrary;
-    _tryBytecode = tryBytecode;
     _javaScriptThread = newJavaScriptThread();
     [self performSelector:@selector(_createContext) onThread:_javaScriptThread withObject:nil waitUntilDone:NO];
   }
@@ -1027,7 +1014,6 @@ static NSData *loadRAMBundle(NSURL *sourceURL, NSError **error, RandomAccessBund
   dispatch_semaphore_wait(_semaphore, DISPATCH_TIME_FOREVER);
   return {
     .useCustomJSCLibrary = _useCustomJSCLibrary,
-    .tryBytecode = _tryBytecode,
     .javaScriptThread = _javaScriptThread,
     .context = _context,
   };