CR Fixes

Cellule · Cellule · commit cc369f422124 · 2016-11-18T19:28:13.000-08:00
diff --git a/lib/Runtime/Library/WebAssemblyEnvironment.cpp b/lib/Runtime/Library/WebAssemblyEnvironment.cpp
@@ -42,8 +42,7 @@ void Js::WebAssemblyEnvironment::CheckPtrIsValid(intptr_t ptr) const
 {
     if (ptr < (intptr_t)start || (intptr_t)(ptr + sizeof(T)) > (intptr_t)end)
     {
-        Assert(UNREACHED);
-        JavascriptError::ThrowTypeError(module->GetScriptContext(), VBSERR_InternalError);
+        Js::Throw::InternalError();
     }
 }
 
@@ -52,8 +51,7 @@ T* Js::WebAssemblyEnvironment::GetVarElement(Var* ptr, uint32 index, uint32 maxC
 {
     if (index >= maxCount)
     {
-        Assert(UNREACHED);
-        JavascriptError::ThrowTypeError(module->GetScriptContext(), VBSERR_InternalError);
+        Js::Throw::InternalError();
     }
 
     Var* functionPtr = ptr + index;
@@ -63,8 +61,7 @@ T* Js::WebAssemblyEnvironment::GetVarElement(Var* ptr, uint32 index, uint32 maxC
     {
         if (!T::Is(varFunc))
         {
-            Assert(UNREACHED);
-            JavascriptError::ThrowTypeError(module->GetScriptContext(), VBSERR_InternalError);
+            Js::Throw::InternalError();
         }
         return T::FromVar(varFunc);
     }
@@ -77,8 +74,7 @@ void Js::WebAssemblyEnvironment::SetVarElement(Var* ptr, T* val, uint32 index, u
     if (index >= maxCount ||
         !T::Is(val))
     {
-        Assert(UNREACHED);
-        JavascriptError::ThrowTypeError(module->GetScriptContext(), VBSERR_InternalError);
+        Js::Throw::InternalError();
     }
 
     Var* dst = ptr + index;
@@ -92,8 +88,7 @@ AsmJsScriptFunction* WebAssemblyEnvironment::GetWasmFunction(uint32 index) const
     if (!(module->GetFunctionIndexType(index) == Wasm::FunctionIndexTypes::Function ||
           module->GetFunctionIndexType(index) == Wasm::FunctionIndexTypes::ImportThunk))
     {
-        Assert(UNREACHED);
-        JavascriptError::ThrowTypeError(module->GetScriptContext(), VBSERR_InternalError);
+        Js::Throw::InternalError();
     }
     return GetVarElement<AsmJsScriptFunction>(functions, index, module->GetWasmFunctionCount());
 }
@@ -104,8 +99,7 @@ void WebAssemblyEnvironment::SetWasmFunction(uint32 index, AsmJsScriptFunction*
           module->GetFunctionIndexType(index) == Wasm::FunctionIndexTypes::ImportThunk) ||
         !AsmJsScriptFunction::IsWasmScriptFunction(func))
     {
-        Assert(UNREACHED);
-        JavascriptError::ThrowTypeError(module->GetScriptContext(), VBSERR_InternalError);
+        Js::Throw::InternalError();
     }
     SetVarElement<AsmJsScriptFunction>(functions, func, index, module->GetWasmFunctionCount());
 }
@@ -156,8 +150,7 @@ Wasm::WasmConstLitNode WebAssemblyEnvironment::GetGlobalValue(Wasm::WasmGlobal*
 {
     if (!global)
     {
-        Assert(UNREACHED);
-        JavascriptError::ThrowTypeError(module->GetScriptContext(), VBSERR_InternalError);
+        Js::Throw::InternalError();
     }
     Wasm::WasmConstLitNode cnst;
     uint32 offset = module->GetOffsetForGlobal(global);
@@ -169,8 +162,7 @@ Wasm::WasmConstLitNode WebAssemblyEnvironment::GetGlobalValue(Wasm::WasmGlobal*
     case Wasm::WasmTypes::F32: cnst.f32 = GetGlobalInternal<float>(offset); break;
     case Wasm::WasmTypes::F64: cnst.f64 = GetGlobalInternal<double>(offset); break;
     default:
-        Assert(UNREACHED);
-        JavascriptError::ThrowTypeError(module->GetScriptContext(), VBSERR_InternalError);
+        Js::Throw::InternalError();
     }
     return cnst;
 }
@@ -179,8 +171,7 @@ void WebAssemblyEnvironment::SetGlobalValue(Wasm::WasmGlobal* global, Wasm::Wasm
 {
     if (!global)
     {
-        Assert(UNREACHED);
-        JavascriptError::ThrowTypeError(module->GetScriptContext(), VBSERR_InternalError);
+        Js::Throw::InternalError();
     }
     uint32 offset = module->GetOffsetForGlobal(global);
 
@@ -191,8 +182,7 @@ void WebAssemblyEnvironment::SetGlobalValue(Wasm::WasmGlobal* global, Wasm::Wasm
     case Wasm::WasmTypes::F32: SetGlobalInternal<float>(offset, cnst.f32); break;
     case Wasm::WasmTypes::F64: SetGlobalInternal<double>(offset, cnst.f64); break;
     default:
-        Assert(UNREACHED);
-        JavascriptError::ThrowTypeError(module->GetScriptContext(), VBSERR_InternalError);
+        Js::Throw::InternalError();
     }
 }
 
diff --git a/lib/Runtime/Library/WebAssemblyInstance.cpp b/lib/Runtime/Library/WebAssemblyInstance.cpp
@@ -388,15 +388,13 @@ void WebAssemblyInstance::LoadImports(
             case Wasm::WasmTypes::F64: cnst.f64 = JavascriptConversion::ToNumber(prop, ctx); break;
             case Wasm::WasmTypes::I64: Js::JavascriptError::ThrowTypeError(ctx, WASMERR_InvalidTypeConversion);
             default:
-                Assert(UNREACHED);
-                JavascriptError::ThrowTypeError(ctx, VBSERR_InternalError);
+                Js::Throw::InternalError();
             }
             env->SetGlobalValue(global, cnst);
             break;
         }
         default:
-            Assert(UNREACHED);
-            JavascriptError::ThrowTypeError(ctx, VBSERR_InternalError);
+            Js::Throw::InternalError();
         }
         ++counter;
     }

Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,7 @@ void Js::WebAssemblyEnvironment::CheckPtrIsValid(intptr_t ptr) const`
`42`	`42`	`{`
`43`	`43`	`if (ptr < (intptr_t)start \|\| (intptr_t)(ptr + sizeof(T)) > (intptr_t)end)`
`44`	`44`	`{`
`45`		`- Assert(UNREACHED);`
`46`		`- JavascriptError::ThrowTypeError(module->GetScriptContext(), VBSERR_InternalError);`
	`45`	`+ Js::Throw::InternalError();`
`47`	`46`	`}`
`48`	`47`	`}`
`49`	`48`
`@@ -52,8 +51,7 @@ T* Js::WebAssemblyEnvironment::GetVarElement(Var* ptr, uint32 index, uint32 maxC`
`52`	`51`	`{`
`53`	`52`	`if (index >= maxCount)`
`54`	`53`	`{`
`55`		`- Assert(UNREACHED);`
`56`		`- JavascriptError::ThrowTypeError(module->GetScriptContext(), VBSERR_InternalError);`
	`54`	`+ Js::Throw::InternalError();`
`57`	`55`	`}`
`58`	`56`
`59`	`57`	`Var* functionPtr = ptr + index;`
`@@ -63,8 +61,7 @@ T* Js::WebAssemblyEnvironment::GetVarElement(Var* ptr, uint32 index, uint32 maxC`
`63`	`61`	`{`
`64`	`62`	`if (!T::Is(varFunc))`
`65`	`63`	`{`
`66`		`- Assert(UNREACHED);`
`67`		`- JavascriptError::ThrowTypeError(module->GetScriptContext(), VBSERR_InternalError);`
	`64`	`+ Js::Throw::InternalError();`
`68`	`65`	`}`
`69`	`66`	`return T::FromVar(varFunc);`
`70`	`67`	`}`
`@@ -77,8 +74,7 @@ void Js::WebAssemblyEnvironment::SetVarElement(Var* ptr, T* val, uint32 index, u`
`77`	`74`	`if (index >= maxCount \|\|`
`78`	`75`	`!T::Is(val))`
`79`	`76`	`{`
`80`		`- Assert(UNREACHED);`
`81`		`- JavascriptError::ThrowTypeError(module->GetScriptContext(), VBSERR_InternalError);`
	`77`	`+ Js::Throw::InternalError();`
`82`	`78`	`}`
`83`	`79`
`84`	`80`	`Var* dst = ptr + index;`
`@@ -92,8 +88,7 @@ AsmJsScriptFunction* WebAssemblyEnvironment::GetWasmFunction(uint32 index) const`
`92`	`88`	`if (!(module->GetFunctionIndexType(index) == Wasm::FunctionIndexTypes::Function \|\|`
`93`	`89`	`module->GetFunctionIndexType(index) == Wasm::FunctionIndexTypes::ImportThunk))`
`94`	`90`	`{`
`95`		`- Assert(UNREACHED);`
`96`		`- JavascriptError::ThrowTypeError(module->GetScriptContext(), VBSERR_InternalError);`
	`91`	`+ Js::Throw::InternalError();`
`97`	`92`	`}`
`98`	`93`	`return GetVarElement<AsmJsScriptFunction>(functions, index, module->GetWasmFunctionCount());`
`99`	`94`	`}`
`@@ -104,8 +99,7 @@ void WebAssemblyEnvironment::SetWasmFunction(uint32 index, AsmJsScriptFunction*`
`104`	`99`	`module->GetFunctionIndexType(index) == Wasm::FunctionIndexTypes::ImportThunk) \|\|`
`105`	`100`	`!AsmJsScriptFunction::IsWasmScriptFunction(func))`
`106`	`101`	`{`
`107`		`- Assert(UNREACHED);`
`108`		`- JavascriptError::ThrowTypeError(module->GetScriptContext(), VBSERR_InternalError);`
	`102`	`+ Js::Throw::InternalError();`
`109`	`103`	`}`
`110`	`104`	`SetVarElement<AsmJsScriptFunction>(functions, func, index, module->GetWasmFunctionCount());`
`111`	`105`	`}`
`@@ -156,8 +150,7 @@ Wasm::WasmConstLitNode WebAssemblyEnvironment::GetGlobalValue(Wasm::WasmGlobal*`
`156`	`150`	`{`
`157`	`151`	`if (!global)`
`158`	`152`	`{`
`159`		`- Assert(UNREACHED);`
`160`		`- JavascriptError::ThrowTypeError(module->GetScriptContext(), VBSERR_InternalError);`
	`153`	`+ Js::Throw::InternalError();`
`161`	`154`	`}`
`162`	`155`	`Wasm::WasmConstLitNode cnst;`
`163`	`156`	`uint32 offset = module->GetOffsetForGlobal(global);`
`@@ -169,8 +162,7 @@ Wasm::WasmConstLitNode WebAssemblyEnvironment::GetGlobalValue(Wasm::WasmGlobal*`
`169`	`162`	`case Wasm::WasmTypes::F32: cnst.f32 = GetGlobalInternal<float>(offset); break;`
`170`	`163`	`case Wasm::WasmTypes::F64: cnst.f64 = GetGlobalInternal<double>(offset); break;`
`171`	`164`	`default:`
`172`		`- Assert(UNREACHED);`
`173`		`- JavascriptError::ThrowTypeError(module->GetScriptContext(), VBSERR_InternalError);`
	`165`	`+ Js::Throw::InternalError();`
`174`	`166`	`}`
`175`	`167`	`return cnst;`
`176`	`168`	`}`
`@@ -179,8 +171,7 @@ void WebAssemblyEnvironment::SetGlobalValue(Wasm::WasmGlobal* global, Wasm::Wasm`
`179`	`171`	`{`
`180`	`172`	`if (!global)`
`181`	`173`	`{`
`182`		`- Assert(UNREACHED);`
`183`		`- JavascriptError::ThrowTypeError(module->GetScriptContext(), VBSERR_InternalError);`
	`174`	`+ Js::Throw::InternalError();`
`184`	`175`	`}`
`185`	`176`	`uint32 offset = module->GetOffsetForGlobal(global);`
`186`	`177`
`@@ -191,8 +182,7 @@ void WebAssemblyEnvironment::SetGlobalValue(Wasm::WasmGlobal* global, Wasm::Wasm`
`191`	`182`	`case Wasm::WasmTypes::F32: SetGlobalInternal<float>(offset, cnst.f32); break;`
`192`	`183`	`case Wasm::WasmTypes::F64: SetGlobalInternal<double>(offset, cnst.f64); break;`
`193`	`184`	`default:`
`194`		`- Assert(UNREACHED);`
`195`		`- JavascriptError::ThrowTypeError(module->GetScriptContext(), VBSERR_InternalError);`
	`185`	`+ Js::Throw::InternalError();`
`196`	`186`	`}`
`197`	`187`	`}`
`198`	`188`
Original file line number	Diff line number	Diff line change
`@@ -388,15 +388,13 @@ void WebAssemblyInstance::LoadImports(`
`388`	`388`	`case Wasm::WasmTypes::F64: cnst.f64 = JavascriptConversion::ToNumber(prop, ctx); break;`
`389`	`389`	`case Wasm::WasmTypes::I64: Js::JavascriptError::ThrowTypeError(ctx, WASMERR_InvalidTypeConversion);`
`390`	`390`	`default:`
`391`		`- Assert(UNREACHED);`
`392`		`- JavascriptError::ThrowTypeError(ctx, VBSERR_InternalError);`
	`391`	`+ Js::Throw::InternalError();`
`393`	`392`	`}`
`394`	`393`	`env->SetGlobalValue(global, cnst);`
`395`	`394`	`break;`
`396`	`395`	`}`
`397`	`396`	`default:`
`398`		`- Assert(UNREACHED);`
`399`		`- JavascriptError::ThrowTypeError(ctx, VBSERR_InternalError);`
	`397`	`+ Js::Throw::InternalError();`
`400`	`398`	`}`
`401`	`399`	`++counter;`
`402`	`400`	`}`