[MERGE #2364 @jianchun] swb: a few fixes (module namespace, Debugger)

Jianchun Xu · Jianchun Xu · commit 9d947dd774e8 · 2017-01-12T10:03:37.000-08:00
Merge pull request #2364 from jianchun:swbmodule ### swb: fix module namespace annotation OP_StModuleSlot was changing slot without write barrier. Annotate all related code. (Credit to Lei for finding it is module namespace related.) ### Revert "fix a pal build issue on my machine" This reverts commit c49e4af. It should now work after Oguz removed wchar_t redef from PAL. ### pin Debugger::m_context Found under stress unit testing. Debugger::m_context was not pinned and could be GC collected when not in use.
diff --git a/bin/ch/Debugger.cpp b/bin/ch/Debugger.cpp
@@ -192,6 +192,11 @@ Debugger::Debugger(JsRuntimeHandle runtime)
 
 Debugger::~Debugger()
 {
+    if (this->m_context != JS_INVALID_REFERENCE)
+    {
+        ChakraRTInterface::JsRelease(this->m_context, nullptr);
+        this->m_context = JS_INVALID_REFERENCE;
+    }
     this->m_runtime = JS_INVALID_RUNTIME_HANDLE;
 }
 
@@ -225,7 +230,9 @@ bool Debugger::Initialize()
     // Create a new context and run dbgcontroller.js in that context
     // setup dbgcontroller.js callbacks
 
+    Assert(this->m_context == JS_INVALID_REFERENCE);
     IfJsrtErrorFailLogAndRetFalse(ChakraRTInterface::JsCreateContext(this->m_runtime, &this->m_context));
+    IfJsrtErrorFailLogAndRetFalse(ChakraRTInterface::JsAddRef(this->m_context, nullptr)); // Pin context
 
     AutoRestoreContext autoRestoreContext(this->m_context);
 
diff --git a/lib/Backend/IRBuilder.cpp b/lib/Backend/IRBuilder.cpp
@@ -3823,7 +3823,7 @@ IRBuilder::BuildElementSlotI2(Js::OpCode newOpcode, uint32 offset, Js::RegSlot r
         case Js::OpCode::LdModuleSlot:
         case Js::OpCode::StModuleSlot:
         {
-            Js::Var* moduleExportVarArrayAddr = Js::JavascriptOperators::OP_GetModuleExportSlotArrayAddress(slotId1, slotId2, m_func->GetScriptContextInfo());
+            Field(Js::Var)* moduleExportVarArrayAddr = Js::JavascriptOperators::OP_GetModuleExportSlotArrayAddress(slotId1, slotId2, m_func->GetScriptContextInfo());
             IR::AddrOpnd* addrOpnd = IR::AddrOpnd::New(moduleExportVarArrayAddr, IR::AddrOpndKindConstantAddress, m_func, true);
             regOpnd = IR::RegOpnd::New(TyVar, m_func);
             instr = IR::Instr::New(Js::OpCode::Ld_A, regOpnd, addrOpnd, m_func);
diff --git a/lib/Backend/ServerScriptContext.cpp b/lib/Backend/ServerScriptContext.cpp
@@ -351,7 +351,7 @@ ServerScriptContext::Release()
     }
 }
 
-Js::Var*
+Field(Js::Var)*
 ServerScriptContext::GetModuleExportSlotArrayAddress(uint moduleIndex, uint slotIndex)
 {
     Assert(m_moduleRecords.ContainsKey(moduleIndex));
@@ -370,7 +370,7 @@ ServerScriptContext::AddModuleRecordInfo(unsigned int moduleId, __int64 localExp
 {
     Js::ServerSourceTextModuleRecord* record = HeapNewStructZ(Js::ServerSourceTextModuleRecord);
     record->moduleId = moduleId;
-    record->localExportSlotsAddr = (Js::Var*)localExportSlotsAddr;
+    record->localExportSlotsAddr = (Field(Js::Var)*)localExportSlotsAddr;
     m_moduleRecords.Add(moduleId, record);
 }
 
diff --git a/lib/Backend/ServerScriptContext.h b/lib/Backend/ServerScriptContext.h
@@ -71,7 +71,7 @@ class ServerScriptContext : public ScriptContextInfo
     typedef JsUtil::BaseDictionary<uint, Js::ServerSourceTextModuleRecord*, Memory::HeapAllocator> ServerModuleRecords;
     ServerModuleRecords m_moduleRecords;
 
-    virtual Js::Var* GetModuleExportSlotArrayAddress(uint moduleIndex, uint slotIndex) override;
+    virtual Field(Js::Var)* GetModuleExportSlotArrayAddress(uint moduleIndex, uint slotIndex) override;
 
     void SetIsPRNGSeeded(bool value);
     void AddModuleRecordInfo(unsigned int moduleId, __int64 localExportSlotsAddr);
diff --git a/lib/Runtime/Base/ScriptContext.cpp b/lib/Runtime/Base/ScriptContext.cpp
@@ -5940,7 +5940,7 @@ void ScriptContext::RegisterPrototypeChainEnsuredToHaveOnlyWritableDataPropertie
         return nameLen;
     }
 
-    Js::Var* ScriptContext::GetModuleExportSlotArrayAddress(uint moduleIndex, uint slotIndex)
+    Field(Js::Var)* ScriptContext::GetModuleExportSlotArrayAddress(uint moduleIndex, uint slotIndex)
     {
         Js::SourceTextModuleRecord* moduleRecord = this->GetModuleRecord(moduleIndex);
         Assert(moduleRecord != nullptr);
diff --git a/lib/Runtime/Base/ScriptContext.h b/lib/Runtime/Base/ScriptContext.h
@@ -1745,7 +1745,7 @@ namespace Js
         virtual bool IsRecyclerVerifyEnabled() const override;
         virtual uint GetRecyclerVerifyPad() const override;
 
-        virtual Js::Var* GetModuleExportSlotArrayAddress(uint moduleIndex, uint slotIndex) override;
+        virtual Field(Js::Var)* GetModuleExportSlotArrayAddress(uint moduleIndex, uint slotIndex) override;
 
         Js::SourceTextModuleRecord* GetModuleRecord(uint moduleId) const
         {
diff --git a/lib/Runtime/Base/ScriptContextInfo.h b/lib/Runtime/Base/ScriptContextInfo.h
@@ -48,7 +48,7 @@ class ScriptContextInfo
 
     virtual bool IsClosed() const = 0;
 
-    virtual Js::Var* GetModuleExportSlotArrayAddress(uint moduleIndex, uint slotIndex) = 0;
+    virtual Field(Js::Var)* GetModuleExportSlotArrayAddress(uint moduleIndex, uint slotIndex) = 0;
 
     virtual intptr_t GetDebuggingFlagsAddr() const = 0;
     virtual intptr_t GetDebugStepTypeAddr() const = 0;
diff --git a/lib/Runtime/Language/JavascriptOperators.cpp b/lib/Runtime/Language/JavascriptOperators.cpp
@@ -6598,22 +6598,22 @@ namespace Js
         return propertyId;
     }
 
-    Var* JavascriptOperators::OP_GetModuleExportSlotArrayAddress(uint moduleIndex, uint slotIndex, ScriptContextInfo* scriptContext)
+    Field(Var)* JavascriptOperators::OP_GetModuleExportSlotArrayAddress(uint moduleIndex, uint slotIndex, ScriptContextInfo* scriptContext)
     {
         return scriptContext->GetModuleExportSlotArrayAddress(moduleIndex, slotIndex);
     }
 
-    Var* JavascriptOperators::OP_GetModuleExportSlotAddress(uint moduleIndex, uint slotIndex, ScriptContext* scriptContext)
+    Field(Var)* JavascriptOperators::OP_GetModuleExportSlotAddress(uint moduleIndex, uint slotIndex, ScriptContext* scriptContext)
     {
-        Var* moduleRecordSlots = OP_GetModuleExportSlotArrayAddress(moduleIndex, slotIndex, scriptContext);
+        Field(Var)* moduleRecordSlots = OP_GetModuleExportSlotArrayAddress(moduleIndex, slotIndex, scriptContext);
         Assert(moduleRecordSlots != nullptr);
 
         return &moduleRecordSlots[slotIndex];
     }
 
     Var JavascriptOperators::OP_LdModuleSlot(uint moduleIndex, uint slotIndex, ScriptContext* scriptContext)
     {
-        Var* addr = OP_GetModuleExportSlotAddress(moduleIndex, slotIndex, scriptContext);
+        Field(Var)* addr = OP_GetModuleExportSlotAddress(moduleIndex, slotIndex, scriptContext);
 
         Assert(addr != nullptr);
 
@@ -6624,7 +6624,7 @@ namespace Js
     {
         Assert(value != nullptr);
 
-        Var* addr = OP_GetModuleExportSlotAddress(moduleIndex, slotIndex, scriptContext);
+        Field(Var)* addr = OP_GetModuleExportSlotAddress(moduleIndex, slotIndex, scriptContext);
 
         Assert(addr != nullptr);
 
diff --git a/lib/Runtime/Language/JavascriptOperators.h b/lib/Runtime/Language/JavascriptOperators.h
@@ -292,8 +292,8 @@ namespace Js
         static void OP_InitClassMemberSet(Var object, PropertyId propertyId, Var setter);
         static void OP_InitClassMemberSetComputedName(Var object, Var elementName, Var getter, ScriptContext* scriptContext, PropertyOperationFlags flags = PropertyOperation_None);
 
-        static Var* OP_GetModuleExportSlotArrayAddress(uint moduleIndex, uint slotIndex, ScriptContextInfo* scriptContext);
-        static Var* OP_GetModuleExportSlotAddress(uint moduleIndex, uint slotIndex, ScriptContext* scriptContext);
+        static Field(Var)* OP_GetModuleExportSlotArrayAddress(uint moduleIndex, uint slotIndex, ScriptContextInfo* scriptContext);
+        static Field(Var)* OP_GetModuleExportSlotAddress(uint moduleIndex, uint slotIndex, ScriptContext* scriptContext);
         static Var OP_LdModuleSlot(uint moduleIndex, uint slotIndex, ScriptContext* scriptContext);
         static void OP_StModuleSlot(uint moduleIndex, uint slotIndex, Var value, ScriptContext* scriptContext);
 
diff --git a/lib/Runtime/Language/ModuleNamespace.h b/lib/Runtime/Language/ModuleNamespace.h
@@ -90,7 +90,7 @@ namespace Js
         Field(ListForListIterator*) sortedExportedNames;   // sorted exported names for both local and indirect exports; excludes symbols.
         Field(Field(Var)*) nsSlots;
 
-        void SetNSSlotsForModuleNS(Var* nsSlot) { this->nsSlots = (Field(Var)*)nsSlot; }
+        void SetNSSlotsForModuleNS(Field(Var)* nsSlot) { this->nsSlots = nsSlot; }
         Var GetNSSlot(BigPropertyIndex propertyIndex);
         void AddUnambiguousNonLocalExport(PropertyId exportId, ModuleNameRecord* nonLocalExportNameRecord);
         UnambiguousExportMap* GetUnambiguousNonLocalExports() const { return unambiguousNonLocalExports; }
diff --git a/lib/Runtime/Language/SourceTextModuleRecord.h b/lib/Runtime/Language/SourceTextModuleRecord.h
@@ -87,8 +87,7 @@ namespace Js
 
         uint GetLocalExportSlotIndexByExportName(PropertyId exportNameId);
         uint GetLocalExportSlotIndexByLocalName(PropertyId localNameId);
-        Var* GetLocalExportSlots() const { return (Var*)(Field(Var)*)localExportSlots; }
-        Var* GetLocalExportSlotAddr(uint slotIndex) const { return (Var*)(Field(Var)*)&localExportSlots[slotIndex]; }
+        Field(Var)* GetLocalExportSlots() const { return localExportSlots; }
         uint GetLocalExportSlotCount() const { return localSlotCount; }
         uint GetModuleId() const { return moduleId; }
         uint GetLocalExportCount() const { return localExportCount; }
@@ -160,6 +159,6 @@ namespace Js
     struct ServerSourceTextModuleRecord
     {
         uint moduleId;
-        Var* localExportSlotsAddr;
+        Field(Var)* localExportSlotsAddr;
     };
 }
diff --git a/pal/src/cruntime/finite.cpp b/pal/src/cruntime/finite.cpp
@@ -1,6 +1,6 @@
 //
 // Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information. 
 //
 
 /*++
@@ -21,15 +21,7 @@ Module Name:
 
 #include "pal/palinternal.h"
 #include "pal/dbgmsg.h"
-
-#if defined(__cplusplus)
-#undef wchar_t
-#endif
 #include <math.h>
-#if defined(__cplusplus)
-#undef wchar_t
-#define wchar_t __wchar_16_cpp__
-#endif // __cplusplus
 
 #if HAVE_IEEEFP_H
 #include <ieeefp.h>
@@ -106,8 +98,8 @@ _isnan(
 
 See MSDN doc
 --*/
-double
-__cdecl
+double 
+__cdecl 
 _copysign(
           double x,
           double y)
@@ -254,7 +246,7 @@ PALIMPORT double __cdecl PAL_exp(double x)
     PERF_ENTRY(exp);
     ENTRY("exp (x=%f)\n", x);
 #if !HAVE_COMPATIBLE_EXP
-    if (x == 1.0)
+    if (x == 1.0) 
     {
         ret = M_E;
     }
@@ -282,8 +274,8 @@ PALIMPORT LONG __cdecl PAL_labs(LONG l)
 
     PERF_ENTRY(labs);
     ENTRY("labs (l=%ld)\n", l);
-
-    lRet = labs(l);
+    
+    lRet = labs(l);    
 
     LOGEXIT("labs returns long %ld\n", lRet);
     PERF_EXIT(labs);

Original file line number	Diff line number	Diff line change
`@@ -3823,7 +3823,7 @@ IRBuilder::BuildElementSlotI2(Js::OpCode newOpcode, uint32 offset, Js::RegSlot r`
`3823`	`3823`	`case Js::OpCode::LdModuleSlot:`
`3824`	`3824`	`case Js::OpCode::StModuleSlot:`
`3825`	`3825`	`{`
`3826`		`- Js::Var* moduleExportVarArrayAddr = Js::JavascriptOperators::OP_GetModuleExportSlotArrayAddress(slotId1, slotId2, m_func->GetScriptContextInfo());`
	`3826`	`+ Field(Js::Var)* moduleExportVarArrayAddr = Js::JavascriptOperators::OP_GetModuleExportSlotArrayAddress(slotId1, slotId2, m_func->GetScriptContextInfo());`
`3827`	`3827`	`IR::AddrOpnd* addrOpnd = IR::AddrOpnd::New(moduleExportVarArrayAddr, IR::AddrOpndKindConstantAddress, m_func, true);`
`3828`	`3828`	`regOpnd = IR::RegOpnd::New(TyVar, m_func);`
`3829`	`3829`	`instr = IR::Instr::New(Js::OpCode::Ld_A, regOpnd, addrOpnd, m_func);`
Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ ServerScriptContext::Release()`
`351`	`351`	`}`
`352`	`352`	`}`
`353`	`353`
`354`		`-Js::Var*`
	`354`	`+Field(Js::Var)*`
`355`	`355`	`ServerScriptContext::GetModuleExportSlotArrayAddress(uint moduleIndex, uint slotIndex)`
`356`	`356`	`{`
`357`	`357`	`Assert(m_moduleRecords.ContainsKey(moduleIndex));`
`@@ -370,7 +370,7 @@ ServerScriptContext::AddModuleRecordInfo(unsigned int moduleId, __int64 localExp`
`370`	`370`	`{`
`371`	`371`	`Js::ServerSourceTextModuleRecord* record = HeapNewStructZ(Js::ServerSourceTextModuleRecord);`
`372`	`372`	`record->moduleId = moduleId;`
`373`		`- record->localExportSlotsAddr = (Js::Var*)localExportSlotsAddr;`
	`373`	`+ record->localExportSlotsAddr = (Field(Js::Var)*)localExportSlotsAddr;`
`374`	`374`	`m_moduleRecords.Add(moduleId, record);`
`375`	`375`	`}`
`376`	`376`
Original file line number	Diff line number	Diff line change
`@@ -5940,7 +5940,7 @@ void ScriptContext::RegisterPrototypeChainEnsuredToHaveOnlyWritableDataPropertie`
`5940`	`5940`	`return nameLen;`
`5941`	`5941`	`}`
`5942`	`5942`
`5943`		`- Js::Var* ScriptContext::GetModuleExportSlotArrayAddress(uint moduleIndex, uint slotIndex)`
	`5943`	`+ Field(Js::Var)* ScriptContext::GetModuleExportSlotArrayAddress(uint moduleIndex, uint slotIndex)`
`5944`	`5944`	`{`
`5945`	`5945`	`Js::SourceTextModuleRecord* moduleRecord = this->GetModuleRecord(moduleIndex);`
`5946`	`5946`	`Assert(moduleRecord != nullptr);`
Original file line number	Diff line number	Diff line change
`@@ -1745,7 +1745,7 @@ namespace Js`
`1745`	`1745`	`virtual bool IsRecyclerVerifyEnabled() const override;`
`1746`	`1746`	`virtual uint GetRecyclerVerifyPad() const override;`
`1747`	`1747`
`1748`		`- virtual Js::Var* GetModuleExportSlotArrayAddress(uint moduleIndex, uint slotIndex) override;`
	`1748`	`+ virtual Field(Js::Var)* GetModuleExportSlotArrayAddress(uint moduleIndex, uint slotIndex) override;`
`1749`	`1749`
`1750`	`1750`	`Js::SourceTextModuleRecord* GetModuleRecord(uint moduleId) const`
`1751`	`1751`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6598,22 +6598,22 @@ namespace Js`
`6598`	`6598`	`return propertyId;`
`6599`	`6599`	`}`
`6600`	`6600`
`6601`		`- Var* JavascriptOperators::OP_GetModuleExportSlotArrayAddress(uint moduleIndex, uint slotIndex, ScriptContextInfo* scriptContext)`
	`6601`	`+ Field(Var)* JavascriptOperators::OP_GetModuleExportSlotArrayAddress(uint moduleIndex, uint slotIndex, ScriptContextInfo* scriptContext)`
`6602`	`6602`	`{`
`6603`	`6603`	`return scriptContext->GetModuleExportSlotArrayAddress(moduleIndex, slotIndex);`
`6604`	`6604`	`}`
`6605`	`6605`
`6606`		`- Var* JavascriptOperators::OP_GetModuleExportSlotAddress(uint moduleIndex, uint slotIndex, ScriptContext* scriptContext)`
	`6606`	`+ Field(Var)* JavascriptOperators::OP_GetModuleExportSlotAddress(uint moduleIndex, uint slotIndex, ScriptContext* scriptContext)`
`6607`	`6607`	`{`
`6608`		`- Var* moduleRecordSlots = OP_GetModuleExportSlotArrayAddress(moduleIndex, slotIndex, scriptContext);`
	`6608`	`+ Field(Var)* moduleRecordSlots = OP_GetModuleExportSlotArrayAddress(moduleIndex, slotIndex, scriptContext);`
`6609`	`6609`	`Assert(moduleRecordSlots != nullptr);`
`6610`	`6610`
`6611`	`6611`	`return &moduleRecordSlots[slotIndex];`
`6612`	`6612`	`}`
`6613`	`6613`
`6614`	`6614`	`Var JavascriptOperators::OP_LdModuleSlot(uint moduleIndex, uint slotIndex, ScriptContext* scriptContext)`
`6615`	`6615`	`{`
`6616`		`- Var* addr = OP_GetModuleExportSlotAddress(moduleIndex, slotIndex, scriptContext);`
	`6616`	`+ Field(Var)* addr = OP_GetModuleExportSlotAddress(moduleIndex, slotIndex, scriptContext);`
`6617`	`6617`
`6618`	`6618`	`Assert(addr != nullptr);`
`6619`	`6619`
`@@ -6624,7 +6624,7 @@ namespace Js`
`6624`	`6624`	`{`
`6625`	`6625`	`Assert(value != nullptr);`
`6626`	`6626`
`6627`		`- Var* addr = OP_GetModuleExportSlotAddress(moduleIndex, slotIndex, scriptContext);`
	`6627`	`+ Field(Var)* addr = OP_GetModuleExportSlotAddress(moduleIndex, slotIndex, scriptContext);`
`6628`	`6628`
`6629`	`6629`	`Assert(addr != nullptr);`
`6630`	`6630`