Revision: 21099
Author: [email protected]
Date: Wed Apr 30 17:12:52 2014 UTC
Log: ContextSlotCache::Update() handlified.
[email protected]
Review URL: https://codereview.chromium.org/263613003
http://code.google.com/p/v8/source/detail?r=21099
Modified:
/branches/bleeding_edge/src/scopeinfo.cc
/branches/bleeding_edge/src/scopeinfo.h
=======================================
--- /branches/bleeding_edge/src/scopeinfo.cc Wed Apr 30 15:13:38 2014 UTC
+++ /branches/bleeding_edge/src/scopeinfo.cc Wed Apr 30 17:12:52 2014 UTC
@@ -307,15 +307,14 @@
*mode = scope_info->ContextLocalMode(var);
*init_flag = scope_info->ContextLocalInitFlag(var);
result = Context::MIN_CONTEXT_SLOTS + var;
- context_slot_cache->Update(
- *scope_info, *name, *mode, *init_flag, result);
+ context_slot_cache->Update(scope_info, name, *mode, *init_flag,
result);
ASSERT(result < scope_info->ContextLength());
return result;
}
}
// Cache as not found. Mode and init flag don't matter.
context_slot_cache->Update(
- *scope_info, *name, INTERNAL, kNeedsInitialization, -1);
+ scope_info, name, INTERNAL, kNeedsInitialization, -1);
}
return -1;
}
@@ -432,18 +431,19 @@
}
-void ContextSlotCache::Update(Object* data,
- String* name,
+void ContextSlotCache::Update(Handle<Object> data,
+ Handle<String> name,
VariableMode mode,
InitializationFlag init_flag,
int slot_index) {
+ DisallowHeapAllocation no_gc;
String* internalized_name;
ASSERT(slot_index > kNotFound);
if (name->GetIsolate()->heap()->InternalizeStringIfExists(
- name, &internalized_name)) {
- int index = Hash(data, internalized_name);
+ *name, &internalized_name)) {
+ int index = Hash(*data, internalized_name);
Key& key = keys_[index];
- key.data = data;
+ key.data = *data;
key.name = internalized_name;
// Please note value only takes a uint as index.
values_[index] = Value(mode, init_flag, slot_index - kNotFound).raw();
@@ -461,18 +461,19 @@
#ifdef DEBUG
-void ContextSlotCache::ValidateEntry(Object* data,
- String* name,
+void ContextSlotCache::ValidateEntry(Handle<Object> data,
+ Handle<String> name,
VariableMode mode,
InitializationFlag init_flag,
int slot_index) {
+ DisallowHeapAllocation no_gc;
String* internalized_name;
if (name->GetIsolate()->heap()->InternalizeStringIfExists(
- name, &internalized_name)) {
- int index = Hash(data, name);
+ *name, &internalized_name)) {
+ int index = Hash(*data, *name);
Key& key = keys_[index];
- ASSERT(key.data == data);
- ASSERT(key.name->Equals(name));
+ ASSERT(key.data == *data);
+ ASSERT(key.name->Equals(*name));
Value result(values_[index]);
ASSERT(result.mode() == mode);
ASSERT(result.initialization_flag() == init_flag);
=======================================
--- /branches/bleeding_edge/src/scopeinfo.h Tue Apr 29 06:42:26 2014 UTC
+++ /branches/bleeding_edge/src/scopeinfo.h Wed Apr 30 17:12:52 2014 UTC
@@ -26,8 +26,8 @@
InitializationFlag* init_flag);
// Update an element in the cache.
- void Update(Object* data,
- String* name,
+ void Update(Handle<Object> data,
+ Handle<String> name,
VariableMode mode,
InitializationFlag init_flag,
int slot_index);
@@ -49,8 +49,8 @@
inline static int Hash(Object* data, String* name);
#ifdef DEBUG
- void ValidateEntry(Object* data,
- String* name,
+ void ValidateEntry(Handle<Object> data,
+ Handle<String> name,
VariableMode mode,
InitializationFlag init_flag,
int slot_index);
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
