[MERGE chakra-core#2491 @MikeHolman] numeric property bv may be null in UpdateJITState

MikeHolman · MikeHolman · commit ea32e97192ed · 2017-02-07T23:08:47.000-08:00
Merge pull request chakra-core#2491 from MikeHolman:numpropfix Top level pointers in parameter list default to [ref] type, which cannot be null. In this case, we should allow argument to be null, so it should be a [unique] pointer.
diff --git a/lib/JITClient/JITManager.cpp b/lib/JITClient/JITManager.cpp
@@ -433,7 +433,7 @@ JITManager::SetWellKnownHostTypeId(
 HRESULT
 JITManager::UpdatePropertyRecordMap(
     __in PTHREADCONTEXT_HANDLE threadContextInfoAddress,
-    __in BVSparseNodeIDL * updatedPropsBVHead)
+    __in_opt BVSparseNodeIDL * updatedPropsBVHead)
 {
     Assert(IsOOPJITEnabled());
 
diff --git a/lib/JITClient/JITManager.h b/lib/JITClient/JITManager.h
@@ -40,7 +40,7 @@ class JITManager
 
     HRESULT UpdatePropertyRecordMap(
         __in PTHREADCONTEXT_HANDLE threadContextInfoAddress,
-        __in BVSparseNodeIDL * updatedPropsBVHead);
+        __in_opt BVSparseNodeIDL * updatedPropsBVHead);
 
     HRESULT NewInterpreterThunkBlock(
         __in PSCRIPTCONTEXT_HANDLE scriptContextInfoAddress,
@@ -145,7 +145,7 @@ class JITManager
 
     HRESULT UpdatePropertyRecordMap(
         __in PTHREADCONTEXT_HANDLE threadContextInfoAddress,
-        __in BVSparseNodeIDL * updatedPropsBVHead)
+        __in_opt BVSparseNodeIDL * updatedPropsBVHead)
         { Assert(false); return E_FAIL; }
 
     HRESULT AddDOMFastPathHelper(
diff --git a/lib/JITIDL/ChakraJIT.idl b/lib/JITIDL/ChakraJIT.idl
@@ -26,7 +26,7 @@ interface IChakraJIT
     HRESULT UpdatePropertyRecordMap(
         [in] handle_t binding,
         [in] PTHREADCONTEXT_HANDLE threadContextInfoAddress,
-        [in] BVSparseNodeIDL * updatedPropsBVHead);
+        [in, unique] BVSparseNodeIDL * updatedPropsBVHead);
 
     HRESULT AddDOMFastPathHelper(
         [in] handle_t binding,
diff --git a/lib/JITServer/JITServer.cpp b/lib/JITServer/JITServer.cpp
@@ -223,7 +223,7 @@ HRESULT
 ServerUpdatePropertyRecordMap(
     /* [in] */ handle_t binding,
     /* [in] */ __RPC__in PTHREADCONTEXT_HANDLE threadContextInfoAddress,
-    /* [in] */ __RPC__in BVSparseNodeIDL * updatedPropsBVHead)
+    /* [in] */ __RPC__in_opt BVSparseNodeIDL * updatedPropsBVHead)
 {
     ServerThreadContext * threadContextInfo = (ServerThreadContext*)DecodePointer(threadContextInfoAddress);
 

Original file line number	Diff line number	Diff line change
`@@ -433,7 +433,7 @@ JITManager::SetWellKnownHostTypeId(`
`433`	`433`	`HRESULT`
`434`	`434`	`JITManager::UpdatePropertyRecordMap(`
`435`	`435`	`__in PTHREADCONTEXT_HANDLE threadContextInfoAddress,`
`436`		`- __in BVSparseNodeIDL * updatedPropsBVHead)`
	`436`	`+ __in_opt BVSparseNodeIDL * updatedPropsBVHead)`
`437`	`437`	`{`
`438`	`438`	`Assert(IsOOPJITEnabled());`
`439`	`439`
Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ HRESULT`
`223`	`223`	`ServerUpdatePropertyRecordMap(`
`224`	`224`	`/* [in] */ handle_t binding,`
`225`	`225`	`/* [in] */ __RPC__in PTHREADCONTEXT_HANDLE threadContextInfoAddress,`
`226`		`- /* [in] / __RPC__in BVSparseNodeIDL updatedPropsBVHead)`
	`226`	`+ /* [in] / __RPC__in_opt BVSparseNodeIDL updatedPropsBVHead)`
`227`	`227`	`{`
`228`	`228`	`ServerThreadContext * threadContextInfo = (ServerThreadContext*)DecodePointer(threadContextInfoAddress);`
`229`	`229`