review comments

MikeHolman · MikeHolman · commit 52e494318a50 · 2018-03-26T13:09:18.000-07:00
diff --git a/lib/Runtime/Library/JavascriptLibrary.cpp b/lib/Runtime/Library/JavascriptLibrary.cpp
@@ -6356,12 +6356,14 @@ namespace Js
 
     EnumeratorCache* JavascriptLibrary::GetObjectAssignCache(Type* type)
     {
+        // Size must be power of 2 for cache indexing to work
+        CompileAssert((Cache::AssignCacheSize & (Cache::AssignCacheSize - 1)) == 0);
+
         if (this->cache.assignCache == nullptr)
         {
             this->cache.assignCache = AllocatorNewArrayZ(CacheAllocator, scriptContext->GetEnumeratorAllocator(), EnumeratorCache, Cache::AssignCacheSize);
         }
-
-        return &this->cache.assignCache[(((size_t)type) >> PolymorphicInlineCacheShift) & (Cache::AssignCacheSize - 1)];
+        return &this->cache.assignCache[(((uintptr_t)type) >> PolymorphicInlineCacheShift) & (Cache::AssignCacheSize - 1)];
     }
 
     SymbolCacheMap* JavascriptLibrary::EnsureSymbolMap()
diff --git a/lib/Runtime/Library/JavascriptLibrary.h b/lib/Runtime/Library/JavascriptLibrary.h
@@ -94,7 +94,7 @@ namespace Js
         Field(DynamicProfileInfoList*) profileInfoList;
 #endif
 #endif
-        Cache() : toStringTagCache(nullptr), toJSONCache(nullptr) { }
+        Cache() : toStringTagCache(nullptr), toJSONCache(nullptr), assignCache(nullptr) { }
     };
 
     class MissingPropertyTypeHandler;

Original file line number	Diff line number	Diff line change
`@@ -6356,12 +6356,14 @@ namespace Js`
`6356`	`6356`
`6357`	`6357`	`EnumeratorCache* JavascriptLibrary::GetObjectAssignCache(Type* type)`
`6358`	`6358`	`{`
	`6359`	`+ // Size must be power of 2 for cache indexing to work`
	`6360`	`+ CompileAssert((Cache::AssignCacheSize & (Cache::AssignCacheSize - 1)) == 0);`
	`6361`	`+`
`6359`	`6362`	`if (this->cache.assignCache == nullptr)`
`6360`	`6363`	`{`
`6361`	`6364`	`this->cache.assignCache = AllocatorNewArrayZ(CacheAllocator, scriptContext->GetEnumeratorAllocator(), EnumeratorCache, Cache::AssignCacheSize);`
`6362`	`6365`	`}`
`6363`		`-`
`6364`		`- return &this->cache.assignCache[(((size_t)type) >> PolymorphicInlineCacheShift) & (Cache::AssignCacheSize - 1)];`
	`6366`	`+ return &this->cache.assignCache[(((uintptr_t)type) >> PolymorphicInlineCacheShift) & (Cache::AssignCacheSize - 1)];`
`6365`	`6367`	`}`
`6366`	`6368`
`6367`	`6369`	`SymbolCacheMap* JavascriptLibrary::EnsureSymbolMap()`