Update V8 to r5017 as required by WebKit r62496
Change-Id: I1b4b7718d1d77ceef07f543e9150a2cb3a628f3a
diff --git a/src/ic.h b/src/ic.h
index 5fd5078..0d5df96 100644
--- a/src/ic.h
+++ b/src/ic.h
@@ -33,10 +33,6 @@
namespace v8 {
namespace internal {
-// Flag indicating whether an IC stub needs to check that a backing
-// store is in dictionary case.
-enum DictionaryCheck { CHECK_DICTIONARY, DICTIONARY_CHECK_DONE };
-
// IC_UTIL_LIST defines all utility functions called from generated
// inline caching code. The argument for the macro, ICU, is the function name.
@@ -121,9 +117,14 @@
return ComputeMode() == RelocInfo::CODE_TARGET_CONTEXT;
}
- // Returns the map to use for caching stubs for a given object.
- // This method should not be called with undefined or null.
- static inline Map* GetCodeCacheMapForObject(Object* object);
+ // Determines which map must be used for keeping the code stub.
+ // These methods should not be called with undefined or null.
+ static inline InlineCacheHolderFlag GetCodeCacheForObject(Object* object,
+ JSObject* holder);
+ static inline InlineCacheHolderFlag GetCodeCacheForObject(JSObject* object,
+ JSObject* holder);
+ static inline Map* GetCodeCacheMap(Object* object,
+ InlineCacheHolderFlag holder);
protected:
Address fp() const { return fp_; }
@@ -388,6 +389,7 @@
static void GenerateMiss(MacroAssembler* masm);
static void GenerateMegamorphic(MacroAssembler* masm);
static void GenerateArrayLength(MacroAssembler* masm);
+ static void GenerateNormal(MacroAssembler* masm);
private:
// Update the inline cache and the global stub cache based on the