Просмотр исходного кода

[1.4>master] [MERGE #2207 @Cellule] Fix Legacy & NoJit

Merge pull request #2207 from Cellule:users/micfer/legacy

Includes #1990
Michael Ferris 9 лет назад
Родитель
Сommit
8525b93d48

+ 10 - 7
Build/Chakra.Core.sln

@@ -28,7 +28,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ChakraCore", "..\bin\Chakra
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{D8216B93-BD6E-4293-8D98-79CEF7CF66BC}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Codex", "..\lib\common\Codex\Chakra.Common.Codex.vcxproj", "{1876E800-AD77-48C4-A2F7-E5265F24AC38}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Codex", "..\lib\Common\Codex\Chakra.Common.Codex.vcxproj", "{1876E800-AD77-48C4-A2F7-E5265F24AC38}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Runtime.ByteCode", "..\lib\Runtime\ByteCode\Chakra.Runtime.ByteCode.vcxproj", "{706083F7-6AA4-4558-A153-6352EF9110F5}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -55,7 +55,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Runtime.Types", "..\
 		{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Common", "..\lib\common\Common\Chakra.Common.Common.vcxproj", "{BB4153FF-AC3E-4734-B562-CC23812DF31B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Common", "..\lib\Common\Common\Chakra.Common.Common.vcxproj", "{BB4153FF-AC3E-4734-B562-CC23812DF31B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
 	EndProjectSection
@@ -64,16 +64,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Runtime", "Runtime", "{DDF4
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{546172B2-F084-4363-BE35-06010663D319}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Core", "..\lib\common\Core\Chakra.Common.Core.vcxproj", "{CC4153FF-AC3E-4734-B562-CC23812DF31B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Core", "..\lib\Common\Core\Chakra.Common.Core.vcxproj", "{CC4153FF-AC3E-4734-B562-CC23812DF31B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.DataStructures", "..\lib\common\DataStructures\Chakra.Common.DataStructures.vcxproj", "{5643D42A-C38D-4D82-9662-58470B3AC9F7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.DataStructures", "..\lib\Common\DataStructures\Chakra.Common.DataStructures.vcxproj", "{5643D42A-C38D-4D82-9662-58470B3AC9F7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Exceptions", "..\lib\common\Exceptions\Chakra.Common.Exceptions.vcxproj", "{FD8EEC40-4141-448A-BF4B-1589FBE4F60D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Exceptions", "..\lib\Common\Exceptions\Chakra.Common.Exceptions.vcxproj", "{FD8EEC40-4141-448A-BF4B-1589FBE4F60D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Memory", "..\lib\common\Memory\Chakra.Common.Memory.vcxproj", "{BB4153FF-AC3E-4734-B562-FF23812DF31B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Memory", "..\lib\Common\Memory\Chakra.Common.Memory.vcxproj", "{BB4153FF-AC3E-4734-B562-FF23812DF31B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
 	EndProjectSection
@@ -104,7 +104,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Runtime.Math", "..\l
 		{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Util", "..\lib\common\util\Chakra.Common.Util.vcxproj", "{6979EC58-7A28-465C-A694-F3323A1F5401}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Util", "..\lib\Common\Util\Chakra.Common.Util.vcxproj", "{6979EC58-7A28-465C-A694-F3323A1F5401}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{158C8616-750C-4E0E-BD3D-5721D3C555E6}"
 EndProject
@@ -125,6 +125,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Runtime.Base", "..\l
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.WasmReader", "..\lib\WasmReader\Chakra.WasmReader.vcxproj", "{53D52B0B-86D9-4D31-AD09-0D6B3C063ADD}"
+	ProjectSection(ProjectDependencies) = postProject
+		{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GCStress", "..\bin\GCStress\GCStress.vcxproj", "{73CE5C59-E0BA-413D-A73C-3EECE067891B}"
 	ProjectSection(ProjectDependencies) = postProject

+ 4 - 4
bin/ch/ChakraRtInterface.h

@@ -73,8 +73,8 @@ struct JsAPIHooks
     typedef JsErrorCode(WINAPI *JsrtParse)(JsValueRef script, JsSourceContext sourceContext, JsValueRef sourceUrl, JsParseScriptAttributes parseAttributes, JsValueRef *result);
     typedef JsErrorCode(WINAPI *JsrtSerialize)(JsValueRef script, JsValueRef *buffer, JsParseScriptAttributes parseAttributes);
     typedef JsErrorCode(WINAPI *JsrtRunSerialized)(JsValueRef buffer, JsSerializedLoadScriptCallback scriptLoadCallback, JsSourceContext sourceContext, JsValueRef sourceUrl, JsValueRef * result);
-    typedef JsErrorCode(WINAPI *JsrtCopyStringUtf8)(JsValueRef value, uint8_t* buffer, size_t bufferSize, size_t* written);
-    typedef JsErrorCode(WINAPI *JsrtCreateStringUtf8)(const uint8_t *content, size_t length, JsValueRef *value);
+    typedef JsErrorCode(WINAPI *JsrtCopyStringUtf8)(JsValueRef value, unsigned char* buffer, size_t bufferSize, size_t* written);
+    typedef JsErrorCode(WINAPI *JsrtCreateStringUtf8)(const unsigned char *content, size_t length, JsValueRef *value);
     typedef JsErrorCode(WINAPI *JsrtCreateExternalArrayBuffer)(void *data, unsigned int byteLength, JsFinalizeCallback finalizeCallback, void *callbackState, JsValueRef *result);
     typedef JsErrorCode(WINAPI *JsrtCreatePropertyIdUtf8)(const char *name, size_t length, JsPropertyIdRef *propertyId);
 
@@ -368,8 +368,8 @@ public:
     static JsErrorCode WINAPI JsParse(JsValueRef script, JsSourceContext sourceContext, JsValueRef sourceUrl, JsParseScriptAttributes parseAttributes, JsValueRef *result) { return HOOK_JS_API(Parse(script, sourceContext, sourceUrl, parseAttributes, result)); }
     static JsErrorCode WINAPI JsSerialize(JsValueRef script, JsValueRef *buffer, JsParseScriptAttributes parseAttributes) { return HOOK_JS_API(Serialize(script, buffer, parseAttributes)); }
     static JsErrorCode WINAPI JsRunSerialized(JsValueRef buffer, JsSerializedLoadScriptCallback scriptLoadCallback, JsSourceContext sourceContext, JsValueRef sourceUrl, JsValueRef * result) { return HOOK_JS_API(RunSerialized(buffer, scriptLoadCallback, sourceContext, sourceUrl, result)); }
-    static JsErrorCode WINAPI JsCopyStringUtf8(JsValueRef value, uint8_t* buffer, size_t bufferSize, size_t* written) { return HOOK_JS_API(CopyStringUtf8(value, buffer, bufferSize, written)); }
-    static JsErrorCode WINAPI JsCreateStringUtf8(const uint8_t *content, size_t length, JsValueRef *value) { return HOOK_JS_API(CreateStringUtf8(content, length, value)); }
+    static JsErrorCode WINAPI JsCopyStringUtf8(JsValueRef value, unsigned char* buffer, size_t bufferSize, size_t* written) { return HOOK_JS_API(CopyStringUtf8(value, buffer, bufferSize, written)); }
+    static JsErrorCode WINAPI JsCreateStringUtf8(const unsigned char *content, size_t length, JsValueRef *value) { return HOOK_JS_API(CreateStringUtf8(content, length, value)); }
     static JsErrorCode WINAPI JsCreatePropertyIdUtf8(const char *name, size_t length, JsPropertyIdRef *propertyId) { return HOOK_JS_API(CreatePropertyIdUtf8(name, length, propertyId)); }
     static JsErrorCode WINAPI JsCreateExternalArrayBuffer(void *data, unsigned int byteLength, JsFinalizeCallback finalizeCallback, void *callbackState, JsValueRef *result)  { return HOOK_JS_API(CreateExternalArrayBuffer(data, byteLength, finalizeCallback, callbackState, result)); }
 };

+ 2 - 2
bin/ch/Debugger.cpp

@@ -236,7 +236,7 @@ bool Debugger::Initialize()
         nullptr, nullptr, &scriptSource));
     JsValueRef fname;
     ChakraRTInterface::JsCreateStringUtf8(
-        (const uint8_t*)"DbgController.js", strlen("DbgController.js"), &fname);
+        (const unsigned char*)"DbgController.js", strlen("DbgController.js"), &fname);
     IfJsrtErrorFailLogAndRetFalse(ChakraRTInterface::JsParse(scriptSource,
         JS_SOURCE_CONTEXT_NONE, fname, JsParseScriptAttributeLibraryCode,
         &globalFunc));
@@ -324,7 +324,7 @@ bool Debugger::SetBaseline()
 
                 JsValueRef wideScriptRef;
                 IfJsrtErrorFailLogAndRetFalse(ChakraRTInterface::JsCreateStringUtf8(
-                  (const uint8_t*)script, strlen(script), &wideScriptRef));
+                  (const unsigned char*)script, strlen(script), &wideScriptRef));
 
                 this->CallFunctionNoResult("SetBaseline", wideScriptRef);
             }

+ 13 - 13
bin/ch/WScriptJsrt.cpp

@@ -52,13 +52,13 @@ DWORD_PTR WScriptJsrt::sourceContext = 0;
         if (FAILED(WideStringToNarrowDynamic(errorMessage, &errorMessageNarrow)))   \
         {                                                                           \
             errorCode = ChakraRTInterface::JsCreateStringUtf8(                      \
-                (const uint8_t*)outOfMemoryString,                                  \
+                (const unsigned char*)outOfMemoryString,                            \
                 strlen(outOfMemoryString), &errorMessageString);                    \
         }                                                                           \
         else                                                                        \
         {                                                                           \
             errorCode = ChakraRTInterface::JsCreateStringUtf8(                      \
-                (const uint8_t*)errorMessageNarrow,                                 \
+                (const unsigned char*)errorMessageNarrow,                           \
                 strlen(errorMessageNarrow), &errorMessageString);                   \
             free(errorMessageNarrow);                                               \
         }                                                                           \
@@ -91,7 +91,7 @@ bool WScriptJsrt::CreateArgumentsObject(JsValueRef *argsObject)
             return false;
         }
         JsErrorCode errCode  = ChakraRTInterface::JsCreateStringUtf8(
-            (const uint8_t*)argNarrow,
+            (const unsigned char*)argNarrow,
             strlen(argNarrow), &value);
         free(argNarrow);
         IfJsrtErrorFail(errCode, false);
@@ -326,7 +326,7 @@ JsErrorCode WScriptJsrt::LoadModuleFromString(LPCSTR fileName, LPCSTR fileConten
     {
         JsValueRef specifier;
         errorCode = ChakraRTInterface::JsCreateStringUtf8(
-            (const uint8_t*)fileName, strlen(fileName), &specifier);
+            (const unsigned char*)fileName, strlen(fileName), &specifier);
         if (errorCode == JsNoError)
         {
             errorCode = ChakraRTInterface::JsInitializeModuleRecord(
@@ -413,7 +413,7 @@ JsValueRef WScriptJsrt::LoadScript(JsValueRef callee, LPCSTR fileName,
         IfJsrtErrorSetGo(ChakraRTInterface::JsCreateExternalArrayBuffer((void*)fileContent,
             (unsigned int)strlen(fileContent), nullptr, nullptr, &scriptSource));
         JsValueRef fname;
-        IfJsrtErrorSetGo(ChakraRTInterface::JsCreateStringUtf8((const uint8_t*)fullPathNarrow,
+        IfJsrtErrorSetGo(ChakraRTInterface::JsCreateStringUtf8((const unsigned char*)fullPathNarrow,
             strlen(fullPathNarrow), &fname));
         errorCode = ChakraRTInterface::JsRun(scriptSource, GetNextSourceContext(),
             fname, JsParseScriptAttributeNone, &returnValue);
@@ -446,7 +446,7 @@ JsValueRef WScriptJsrt::LoadScript(JsValueRef callee, LPCSTR fileName,
         IfJsrtErrorSetGo(ChakraRTInterface::JsCreateExternalArrayBuffer((void*)fileContent,
             (unsigned int)strlen(fileContent), nullptr, nullptr, &scriptSource));
         JsValueRef fname;
-        IfJsrtErrorSetGo(ChakraRTInterface::JsCreateStringUtf8((const uint8_t*)fullPathNarrow,
+        IfJsrtErrorSetGo(ChakraRTInterface::JsCreateStringUtf8((const unsigned char*)fullPathNarrow,
             strlen(fullPathNarrow), &fname));
         errorCode = ChakraRTInterface::JsRun(scriptSource, GetNextSourceContext(),
             fname, JsParseScriptAttributeNone, &returnValue);
@@ -724,7 +724,7 @@ bool WScriptJsrt::CreateNamedFunction(const char* nameString, JsNativeFunction c
 {
     JsValueRef nameVar;
     IfJsrtErrorFail(ChakraRTInterface::JsCreateStringUtf8(
-        (const uint8_t*)nameString, strlen(nameString), &nameVar), false);
+        (const unsigned char*)nameString, strlen(nameString), &nameVar), false);
     IfJsrtErrorFail(ChakraRTInterface::JsCreateNamedFunction(nameVar, callback,
         nullptr, functionVar), false);
     return true;
@@ -852,7 +852,7 @@ bool WScriptJsrt::Initialize()
     IfJsrtErrorFail(CreatePropertyIdFromString("ARCH", &archProperty), false);
     JsValueRef archValue;
     IfJsrtErrorFail(ChakraRTInterface::JsCreateStringUtf8(
-        (const uint8_t*)CPU_ARCH_TEXT, strlen(CPU_ARCH_TEXT), &archValue), false);
+        (const unsigned char*)CPU_ARCH_TEXT, strlen(CPU_ARCH_TEXT), &archValue), false);
     IfJsrtErrorFail(ChakraRTInterface::JsSetProperty(platformObject, archProperty,
         archValue, true), false);
 
@@ -876,7 +876,7 @@ bool WScriptJsrt::Initialize()
     IfJsrtErrorFail(CreatePropertyIdFromString("LINK_TYPE", &linkProperty), false);
     JsValueRef linkValue;
     IfJsrtErrorFail(ChakraRTInterface::JsCreateStringUtf8(
-        (const uint8_t*)LINK_TYPE, strlen(LINK_TYPE), &linkValue), false);
+        (const unsigned char*)LINK_TYPE, strlen(LINK_TYPE), &linkValue), false);
     IfJsrtErrorFail(ChakraRTInterface::JsSetProperty(platformObject, linkProperty,
       linkValue, true), false);
 
@@ -888,7 +888,7 @@ bool WScriptJsrt::Initialize()
     IfJsrtErrorFail(CreatePropertyIdFromString("BINARY_PATH", &binaryPathProperty), false);
 
     IfJsrtErrorFail(ChakraRTInterface::JsCreateStringUtf8(
-        (const uint8_t*)CH_BINARY_LOCATION,
+        (const unsigned char*)CH_BINARY_LOCATION,
         strlen(CH_BINARY_LOCATION), &binaryPathValue), false);
     IfJsrtErrorFail(ChakraRTInterface::JsSetProperty(
         platformObject, binaryPathProperty, binaryPathValue, true), false);
@@ -898,7 +898,7 @@ bool WScriptJsrt::Initialize()
     IfJsrtErrorFail(CreatePropertyIdFromString("OS", &osProperty), false);
     JsValueRef osValue;
     IfJsrtErrorFail(ChakraRTInterface::JsCreateStringUtf8(
-        (const uint8_t*)DEST_PLATFORM_TEXT,
+        (const unsigned char*)DEST_PLATFORM_TEXT,
         strlen(DEST_PLATFORM_TEXT), &osValue), false);
     IfJsrtErrorFail(ChakraRTInterface::JsSetProperty(platformObject, osProperty,
         osValue, true), false);
@@ -979,7 +979,7 @@ JsValueRef __stdcall WScriptJsrt::LoadTextFileCallback(JsValueRef callee, bool i
             {
                 JsValueRef stringObject;
                 IfJsrtErrorSetGo(ChakraRTInterface::JsCreateStringUtf8(
-                    (const uint8_t*)fileContent,
+                    (const unsigned char*)fileContent,
                     lengthBytes, &stringObject));
                 return stringObject;
             }
@@ -1204,7 +1204,7 @@ HRESULT WScriptJsrt::CallbackMessage::CallFunction(LPCSTR fileName)
         IfJsrtErrorHR(ChakraRTInterface::JsConvertValueToString(m_function, &stringValue));
 
         JsValueRef fname;
-        ChakraRTInterface::JsCreateStringUtf8((const uint8_t*)"", strlen(""), &fname);
+        ChakraRTInterface::JsCreateStringUtf8((const unsigned char*)"", strlen(""), &fname);
         // Run the code
         errorCode = ChakraRTInterface::JsRun(stringValue, JS_SOURCE_CONTEXT_NONE,
           fname, JsParseScriptAttributeArrayBufferIsUtf16Encoded,

+ 1 - 1
bin/ch/ch.cpp

@@ -291,7 +291,7 @@ HRESULT RunScript(const char* fileName, LPCSTR fileContents, JsValueRef bufferVa
 
         JsErrorCode runScript;
         JsValueRef fname;
-        IfJsErrorFailLog(ChakraRTInterface::JsCreateStringUtf8((const uint8_t*)fullPath,
+        IfJsErrorFailLog(ChakraRTInterface::JsCreateStringUtf8((const unsigned char*)fullPath,
             strlen(fullPath), &fname));
 
         if(bufferValue != nullptr)

+ 1 - 1
bin/ch/stdafx.h

@@ -186,7 +186,7 @@ public:
             if (errorCode == JsNoError)
             {
                 data = (char*) malloc((len + 1) * sizeof(char));
-                uint8_t *udata = (uint8_t*)data;
+                unsigned char *udata = (unsigned char*)data;
                 ChakraRTInterface::JsCopyStringUtf8(strValue, udata, len + 1, &length);
                 AssertMsg(len == length, "If you see this message.. There is something seriously wrong. Good Luck!");
                 *(data + len) = char(0);

+ 2 - 2
lib/Common/Memory/PageAllocator.cpp

@@ -1591,7 +1591,7 @@ PageAllocatorBase<TVirtualAlloc, TSegment, TPageSegment>::MemSetLocal(_In_ void
     memset(dst, val, sizeInBytes);
 }
 
-#if _WIN32
+#if ENABLE_OOP_NATIVE_CODEGEN
 template<>
 void
 PageAllocatorBase<SectionAllocWrapper>::MemSetLocal(_In_ void *dst, int val, size_t sizeInBytes)
@@ -2862,7 +2862,7 @@ namespace Memory
     template class SegmentBase       < PreReservedVirtualAllocWrapper >;
     template class PageSegmentBase   < VirtualAllocWrapper >;
     template class PageSegmentBase   < PreReservedVirtualAllocWrapper >;
-#if _WIN32
+#if ENABLE_OOP_NATIVE_CODEGEN
     template class PageAllocatorBase < SectionAllocWrapper >;
     template class PageAllocatorBase < PreReservedSectionAllocWrapper >;
     template class HeapPageAllocator < SectionAllocWrapper >;

+ 1 - 1
lib/Common/Memory/PageAllocator.h

@@ -378,7 +378,7 @@ private:
 
     friend class PageAllocatorBase<VirtualAllocWrapper>;
     friend class PageAllocatorBase<PreReservedVirtualAllocWrapper>;
-#if _WIN32
+#if ENABLE_OOP_NATIVE_CODEGEN
     friend class PageAllocatorBase<SectionAllocWrapper>;
     friend class PageAllocatorBase<PreReservedSectionAllocWrapper>;
 #endif

+ 5 - 5
lib/Jsrt/ChakraCore.h

@@ -212,7 +212,7 @@ CHAKRA_API
 /// </returns>
 CHAKRA_API
     JsCreateStringUtf8(
-        _In_ const uint8_t *content,
+        _In_ const unsigned char *content,
         _In_ size_t length,
         _Out_ JsValueRef *value);
 
@@ -232,7 +232,7 @@ CHAKRA_API
 /// </returns>
 CHAKRA_API
     JsCreateStringUtf16(
-        _In_ const uint16_t *content,
+        _In_ const unsigned short *content,
         _In_ size_t length,
         _Out_ JsValueRef *value);
 
@@ -289,7 +289,7 @@ CHAKRA_API
 CHAKRA_API
     JsCopyStringUtf8(
         _In_ JsValueRef value,
-        _Out_opt_ uint8_t* buffer,
+        _Out_opt_ unsigned char* buffer,
         _In_ size_t bufferSize,
         _Out_opt_ size_t* written);
 
@@ -323,7 +323,7 @@ CHAKRA_API
         _In_ JsValueRef value,
         _In_ int start,
         _In_ int length,
-        _Out_opt_ uint16_t* buffer,
+        _Out_opt_ unsigned short* buffer,
         _Out_opt_ size_t* written);
 
 /// <summary>
@@ -445,7 +445,7 @@ CHAKRA_API
 CHAKRA_API
     JsCopyPropertyIdUtf8(
         _In_ JsPropertyIdRef propertyId,
-        _Out_ uint8_t* buffer,
+        _Out_ unsigned char* buffer,
         _In_ size_t bufferSize,
         _Out_ size_t* length);
 

+ 0 - 1
lib/Runtime/Language/AsmJsUtils.cpp

@@ -576,7 +576,6 @@ namespace Js
         ScriptFunction* func = (ScriptFunction*)entryObject;
         FunctionBody* body = func->GetFunctionBody();
         AsmJsFunctionInfo* info = body->GetAsmJsFunctionInfo();
-        const uint argInCount = callInfo.Count - 1;
         int argSize = info->GetArgByteSize();
         char* dst;
         Var returnValue = 0;

+ 1 - 1
lib/Runtime/Library/JavascriptArray.h

@@ -439,7 +439,7 @@ namespace Js
         void SetHasNoMissingValues(const bool hasNoMissingValues = true);
 
         template<typename T>
-        bool JavascriptArray::IsMissingItemAt(uint32 index) const;
+        bool IsMissingItemAt(uint32 index) const;
         bool IsMissingItem(uint32 index);
 
         virtual bool IsMissingHeadSegmentItem(const uint32 index) const;

+ 1 - 1
lib/Runtime/Library/WebAssemblyTable.cpp

@@ -121,7 +121,7 @@ WebAssemblyTable::EntryGrow(RecyclableObject* function, CallInfo callInfo, ...)
     {
         JavascriptError::ThrowRangeError(scriptContext, JSERR_ArgumentOutOfRange);
     }
-    CompileAssert(sizeof(m_maxLength) == sizeof(uint32));
+    CompileAssert(sizeof(table->m_maxLength) == sizeof(uint32));
 
     uint32 newLength = table->m_currentLength + delta;
     Var * newValues = RecyclerNewArrayZ(scriptContext->GetRecycler(), Var, newLength);