Revision: 5177
Author: [email protected]
Date: Thu Aug 5 04:19:43 2010
Log: Revert r5174.
Review URL: http://codereview.chromium.org/2868108
http://code.google.com/p/v8/source/detail?r=5177
Modified:
/branches/bleeding_edge/src/arm/stub-cache-arm.cc
/branches/bleeding_edge/src/heap-inl.h
/branches/bleeding_edge/src/heap.cc
/branches/bleeding_edge/src/heap.h
/branches/bleeding_edge/src/ia32/stub-cache-ia32.cc
/branches/bleeding_edge/src/ic.cc
/branches/bleeding_edge/src/stub-cache.cc
/branches/bleeding_edge/src/stub-cache.h
/branches/bleeding_edge/src/x64/stub-cache-x64.cc
=======================================
--- /branches/bleeding_edge/src/arm/stub-cache-arm.cc Thu Aug 5 01:37:12
2010
+++ /branches/bleeding_edge/src/arm/stub-cache-arm.cc Thu Aug 5 04:19:43
2010
@@ -1252,11 +1252,9 @@
}
-Object* CallStubCompiler::GenerateMissBranch() {
- Object* obj = StubCache::ComputeCallMiss(arguments().immediate(), kind_);
- if (obj->IsFailure()) return obj;
- __ Jump(Handle<Code>(Code::cast(obj)), RelocInfo::CODE_TARGET);
- return obj;
+void CallStubCompiler::GenerateMissBranch() {
+ Handle<Code> ic = ComputeCallMiss(arguments().immediate(), kind_);
+ __ Jump(ic, RelocInfo::CODE_TARGET);
}
@@ -1288,8 +1286,7 @@
// Handle call cache miss.
__ bind(&miss);
- Object* obj = GenerateMissBranch();
- if (obj->IsFailure()) return obj;
+ GenerateMissBranch();
// Return the generated code.
return GetCode(FIELD, name);
@@ -1340,8 +1337,7 @@
// Handle call cache miss.
__ bind(&miss);
- Object* obj = GenerateMissBranch();
- if (obj->IsFailure()) return obj;
+ GenerateMissBranch();
// Return the generated code.
return GetCode(function);
@@ -1392,8 +1388,7 @@
// Handle call cache miss.
__ bind(&miss);
- Object* obj = GenerateMissBranch();
- if (obj->IsFailure()) return obj;
+ GenerateMissBranch();
// Return the generated code.
return GetCode(function);
@@ -1566,8 +1561,7 @@
}
__ bind(&miss_in_smi_check);
- Object* obj = GenerateMissBranch();
- if (obj->IsFailure()) return obj;
+ GenerateMissBranch();
// Return the generated code.
return GetCode(function);
@@ -1616,8 +1610,7 @@
// Handle call cache miss.
__ bind(&miss);
- Object* obj = GenerateMissBranch();
- if (obj->IsFailure()) return obj;
+ GenerateMissBranch();
// Return the generated code.
return GetCode(INTERCEPTOR, name);
@@ -1701,8 +1694,7 @@
// Handle call cache miss.
__ bind(&miss);
__ IncrementCounter(&Counters::call_global_inline_miss, 1, r1, r3);
- Object* obj = GenerateMissBranch();
- if (obj->IsFailure()) return obj;
+ GenerateMissBranch();
// Return the generated code.
return GetCode(NORMAL, name);
=======================================
--- /branches/bleeding_edge/src/heap-inl.h Thu Aug 5 01:37:12 2010
+++ /branches/bleeding_edge/src/heap-inl.h Thu Aug 5 04:19:43 2010
@@ -434,12 +434,6 @@
allocation_allowed_ = new_state;
return old;
}
-
-inline bool Heap::allow_gc(bool new_state) {
- bool old = gc_allowed_;
- gc_allowed_ = new_state;
- return old;
-}
#endif
=======================================
--- /branches/bleeding_edge/src/heap.cc Thu Aug 5 01:37:12 2010
+++ /branches/bleeding_edge/src/heap.cc Thu Aug 5 04:19:43 2010
@@ -134,7 +134,6 @@
#ifdef DEBUG
bool Heap::allocation_allowed_ = true;
-bool Heap::gc_allowed_ = true;
int Heap::allocation_timeout_ = 0;
bool Heap::disallow_allocation_failure_ = false;
@@ -320,9 +319,6 @@
void Heap::GarbageCollectionPrologue() {
-#ifdef DEBUG
- ASSERT(gc_allowed_);
-#endif
TranscendentalCache::Clear();
ClearJSFunctionResultCaches();
gc_count_++;
=======================================
--- /branches/bleeding_edge/src/heap.h Thu Aug 5 01:37:12 2010
+++ /branches/bleeding_edge/src/heap.h Thu Aug 5 04:19:43 2010
@@ -877,8 +877,6 @@
#ifdef DEBUG
static bool IsAllocationAllowed() { return allocation_allowed_; }
static inline bool allow_allocation(bool enable);
- static bool IsGCAllowed() { return gc_allowed_; }
- static inline bool allow_gc(bool enable);
static bool disallow_allocation_failure() {
return disallow_allocation_failure_;
@@ -1080,7 +1078,6 @@
#ifdef DEBUG
static bool allocation_allowed_;
- static bool gc_allowed_;
// If the --gc-interval flag is set to a positive value, this
// variable holds the value indicating the number of allocations
@@ -1678,20 +1675,6 @@
~AssertNoAllocation() {
Heap::allow_allocation(old_state_);
}
-
- private:
- bool old_state_;
-};
-
-class AssertNoGC {
- public:
- AssertNoGC() {
- old_state_ = Heap::allow_gc(false);
- }
-
- ~AssertNoGC() {
- Heap::allow_gc(old_state_);
- }
private:
bool old_state_;
@@ -1719,12 +1702,6 @@
~AssertNoAllocation() { }
};
-class AssertNoGC {
- public:
- AssertNoGC() { }
- ~AssertNoGC() { }
-};
-
class DisableAssertNoAllocation {
public:
DisableAssertNoAllocation() { }
=======================================
--- /branches/bleeding_edge/src/ia32/stub-cache-ia32.cc Thu Aug 5 01:37:12
2010
+++ /branches/bleeding_edge/src/ia32/stub-cache-ia32.cc Thu Aug 5 04:19:43
2010
@@ -1287,11 +1287,9 @@
}
-Object* CallStubCompiler::GenerateMissBranch() {
- Object* obj = StubCache::ComputeCallMiss(arguments().immediate(), kind_);
- if (obj->IsFailure()) return obj;
- __ jmp(Handle<Code>(Code::cast(obj)), RelocInfo::CODE_TARGET);
- return obj;
+void CallStubCompiler::GenerateMissBranch() {
+ Handle<Code> ic = ComputeCallMiss(arguments().immediate(), kind_);
+ __ jmp(ic, RelocInfo::CODE_TARGET);
}
@@ -1342,8 +1340,7 @@
// Handle call cache miss.
__ bind(&miss);
- Object* obj = GenerateMissBranch();
- if (obj->IsFailure()) return obj;
+ GenerateMissBranch();
// Return the generated code.
return GetCode(FIELD, name);
@@ -1490,8 +1487,7 @@
}
__ bind(&miss);
- Object* obj = GenerateMissBranch();
- if (obj->IsFailure()) return obj;
+ GenerateMissBranch();
// Return the generated code.
return GetCode(function);
@@ -1574,8 +1570,7 @@
1);
__ bind(&miss);
- Object* obj = GenerateMissBranch();
- if (obj->IsFailure()) return obj;
+ GenerateMissBranch();
// Return the generated code.
return GetCode(function);
@@ -1638,8 +1633,8 @@
__ ret((argc + 1) * kPointerSize);
__ bind(&miss);
- Object* obj = GenerateMissBranch();
- if (obj->IsFailure()) return obj;
+
+ GenerateMissBranch();
// Return the generated code.
return GetCode(function);
@@ -1705,8 +1700,9 @@
__ ret((argc + 1) * kPointerSize);
__ bind(&miss);
- Object* obj = GenerateMissBranch();
- if (obj->IsFailure()) return obj;
+ // Restore function name in ecx.
+
+ GenerateMissBranch();
// Return the generated code.
return GetCode(function);
@@ -1860,8 +1856,7 @@
FreeSpaceForFastApiCall(masm(), eax);
}
__ bind(&miss_in_smi_check);
- Object* obj = GenerateMissBranch();
- if (obj->IsFailure()) return obj;
+ GenerateMissBranch();
// Return the generated code.
return GetCode(function);
@@ -1925,8 +1920,7 @@
// Handle load cache miss.
__ bind(&miss);
- Object* obj = GenerateMissBranch();
- if (obj->IsFailure()) return obj;
+ GenerateMissBranch();
// Return the generated code.
return GetCode(INTERCEPTOR, name);
@@ -2011,8 +2005,7 @@
// Handle call cache miss.
__ bind(&miss);
__ IncrementCounter(&Counters::call_global_inline_miss, 1);
- Object* obj = GenerateMissBranch();
- if (obj->IsFailure()) return obj;
+ GenerateMissBranch();
// Return the generated code.
return GetCode(NORMAL, name);
=======================================
--- /branches/bleeding_edge/src/ic.cc Thu Aug 5 01:37:12 2010
+++ /branches/bleeding_edge/src/ic.cc Thu Aug 5 04:19:43 2010
@@ -501,24 +501,20 @@
// Lookup the property in the object.
LookupResult lookup;
- {
- AssertNoGC nogc; // GC could invalidate the pointers held in lookup.
-
- LookupForRead(*object, *name, &lookup);
-
- if (!lookup.IsProperty()) {
- // If the object does not have the requested property, check which
- // exception we need to throw.
- if (IsContextual(object)) {
- return ReferenceError("not_defined", name);
- }
- return TypeError("undefined_method", object, name);
- }
-
- // Lookup is valid: Update inline cache and stub cache.
- if (FLAG_use_ic) {
- UpdateCaches(&lookup, state, object, name);
- }
+ LookupForRead(*object, *name, &lookup);
+
+ if (!lookup.IsProperty()) {
+ // If the object does not have the requested property, check which
+ // exception we need to throw.
+ if (IsContextual(object)) {
+ return ReferenceError("not_defined", name);
+ }
+ return TypeError("undefined_method", object, name);
+ }
+
+ // Lookup is valid: Update inline cache and stub cache.
+ if (FLAG_use_ic) {
+ UpdateCaches(&lookup, state, object, name);
}
// Get the property.
@@ -791,72 +787,68 @@
// Named lookup in the object.
LookupResult lookup;
- {
- AssertNoGC nogc; // GC could invalidate the pointers held in lookup.
-
- LookupForRead(*object, *name, &lookup);
-
- // If we did not find a property, check if we need to throw an
exception.
- if (!lookup.IsProperty()) {
- if (FLAG_strict || IsContextual(object)) {
- return ReferenceError("not_defined", name);
- }
- LOG(SuspectReadEvent(*name, *object));
- }
-
- bool can_be_inlined =
- FLAG_use_ic &&
- state == PREMONOMORPHIC &&
- lookup.IsProperty() &&
- lookup.IsCacheable() &&
- lookup.holder() == *object &&
- lookup.type() == FIELD &&
- !object->IsAccessCheckNeeded();
-
- if (can_be_inlined) {
- Map* map = lookup.holder()->map();
- // Property's index in the properties array. If negative we have
- // an inobject property.
- int index = lookup.GetFieldIndex() - map->inobject_properties();
- if (index < 0) {
- // Index is an offset from the end of the object.
- int offset = map->instance_size() + (index * kPointerSize);
- if (PatchInlinedLoad(address(), map, offset)) {
- set_target(megamorphic_stub());
- #ifdef DEBUG
- if (FLAG_trace_ic) {
- PrintF("[LoadIC : inline patch %s]\n", *name->ToCString());
- }
- #endif
- return lookup.holder()->FastPropertyAt(lookup.GetFieldIndex());
- #ifdef DEBUG
- } else {
- if (FLAG_trace_ic) {
- PrintF("[LoadIC : no inline patch %s (patching failed)]\n",
- *name->ToCString());
- }
- }
+ LookupForRead(*object, *name, &lookup);
+
+ // If we did not find a property, check if we need to throw an exception.
+ if (!lookup.IsProperty()) {
+ if (FLAG_strict || IsContextual(object)) {
+ return ReferenceError("not_defined", name);
+ }
+ LOG(SuspectReadEvent(*name, *object));
+ }
+
+ bool can_be_inlined =
+ FLAG_use_ic &&
+ state == PREMONOMORPHIC &&
+ lookup.IsProperty() &&
+ lookup.IsCacheable() &&
+ lookup.holder() == *object &&
+ lookup.type() == FIELD &&
+ !object->IsAccessCheckNeeded();
+
+ if (can_be_inlined) {
+ Map* map = lookup.holder()->map();
+ // Property's index in the properties array. If negative we have
+ // an inobject property.
+ int index = lookup.GetFieldIndex() - map->inobject_properties();
+ if (index < 0) {
+ // Index is an offset from the end of the object.
+ int offset = map->instance_size() + (index * kPointerSize);
+ if (PatchInlinedLoad(address(), map, offset)) {
+ set_target(megamorphic_stub());
+#ifdef DEBUG
+ if (FLAG_trace_ic) {
+ PrintF("[LoadIC : inline patch %s]\n", *name->ToCString());
+ }
+#endif
+ return lookup.holder()->FastPropertyAt(lookup.GetFieldIndex());
+#ifdef DEBUG
} else {
if (FLAG_trace_ic) {
- PrintF("[LoadIC : no inline patch %s (not inobject)]\n",
+ PrintF("[LoadIC : no inline patch %s (patching failed)]\n",
*name->ToCString());
}
}
} else {
- if (FLAG_use_ic && state == PREMONOMORPHIC) {
- if (FLAG_trace_ic) {
- PrintF("[LoadIC : no inline patch %s (not inlinable)]\n",
- *name->ToCString());
- #endif
- }
+ if (FLAG_trace_ic) {
+ PrintF("[LoadIC : no inline patch %s (not inobject)]\n",
+ *name->ToCString());
}
}
-
- // Update inline cache and stub cache.
- if (FLAG_use_ic) {
- UpdateCaches(&lookup, state, object, name);
+ } else {
+ if (FLAG_use_ic && state == PREMONOMORPHIC) {
+ if (FLAG_trace_ic) {
+ PrintF("[LoadIC : no inline patch %s (not inlinable)]\n",
+ *name->ToCString());
+#endif
+ }
}
}
+
+ // Update inline cache and stub cache.
+ if (FLAG_use_ic) {
+ UpdateCaches(&lookup, state, object, name);
+ }
PropertyAttributes attr;
if (lookup.IsProperty() && lookup.type() == INTERCEPTOR) {
@@ -1045,21 +1037,17 @@
// Named lookup.
LookupResult lookup;
- {
- AssertNoGC nogc; // GC could invalidate the pointers held in lookup.
-
- LookupForRead(*object, *name, &lookup);
-
- // If we did not find a property, check if we need to throw an
exception.
- if (!lookup.IsProperty()) {
- if (FLAG_strict || IsContextual(object)) {
- return ReferenceError("not_defined", name);
- }
- }
-
- if (FLAG_use_ic) {
- UpdateCaches(&lookup, state, object, name);
- }
+ LookupForRead(*object, *name, &lookup);
+
+ // If we did not find a property, check if we need to throw an
exception.
+ if (!lookup.IsProperty()) {
+ if (FLAG_strict || IsContextual(object)) {
+ return ReferenceError("not_defined", name);
+ }
+ }
+
+ if (FLAG_use_ic) {
+ UpdateCaches(&lookup, state, object, name);
}
PropertyAttributes attr;
@@ -1257,8 +1245,6 @@
// Lookup the property locally in the receiver.
if (FLAG_use_ic && !receiver->IsJSGlobalProxy()) {
- AssertNoGC nogc; // GC could invalidate the pointers held in lookup.
-
LookupResult lookup;
if (LookupForWrite(*receiver, *name, &lookup)) {
@@ -1432,17 +1418,13 @@
return *value;
}
- {
- AssertNoGC nogc; // GC could invalidate the pointers held in lookup.
-
- // Lookup the property locally in the receiver.
- LookupResult lookup;
- receiver->LocalLookup(*name, &lookup);
-
- // Update inline cache and stub cache.
- if (FLAG_use_ic) {
- UpdateCaches(&lookup, state, receiver, name, value);
- }
+ // Lookup the property locally in the receiver.
+ LookupResult lookup;
+ receiver->LocalLookup(*name, &lookup);
+
+ // Update inline cache and stub cache.
+ if (FLAG_use_ic) {
+ UpdateCaches(&lookup, state, receiver, name, value);
}
// Set the property.
=======================================
--- /branches/bleeding_edge/src/stub-cache.cc Thu Aug 5 01:37:12 2010
+++ /branches/bleeding_edge/src/stub-cache.cc Thu Aug 5 04:19:43 2010
@@ -822,6 +822,13 @@
// StubCompiler implementation.
+// Support function for computing call IC miss stubs.
+Handle<Code> ComputeCallMiss(int argc, Code::Kind kind) {
+ CALL_HEAP_FUNCTION(StubCache::ComputeCallMiss(argc, kind), Code);
+}
+
+
+
Object* LoadCallbackProperty(Arguments args) {
ASSERT(args[0]->IsJSObject());
ASSERT(args[1]->IsJSObject());
=======================================
--- /branches/bleeding_edge/src/stub-cache.h Thu Aug 5 01:37:12 2010
+++ /branches/bleeding_edge/src/stub-cache.h Thu Aug 5 04:19:43 2010
@@ -336,6 +336,10 @@
Object* KeyedLoadPropertyWithInterceptor(Arguments args);
+// Support function for computing call IC miss stubs.
+Handle<Code> ComputeCallMiss(int argc, Code::Kind kind);
+
+
// The stub compiler compiles stubs for the stub cache.
class StubCompiler BASE_EMBEDDED {
public:
@@ -684,9 +688,7 @@
void GenerateNameCheck(String* name, Label* miss);
- // Generates a jump to CallIC miss stub. Returns Failure if the jump
cannot
- // be generated.
- Object* GenerateMissBranch();
+ void GenerateMissBranch();
};
=======================================
--- /branches/bleeding_edge/src/x64/stub-cache-x64.cc Thu Aug 5 01:37:12
2010
+++ /branches/bleeding_edge/src/x64/stub-cache-x64.cc Thu Aug 5 04:19:43
2010
@@ -820,11 +820,9 @@
}
-Object* CallStubCompiler::GenerateMissBranch() {
- Object* obj = StubCache::ComputeCallMiss(arguments().immediate(), kind_);
- if (obj->IsFailure()) return obj;
- __ Jump(Handle<Code>(Code::cast(obj)), RelocInfo::CODE_TARGET);
- return obj;
+void CallStubCompiler::GenerateMissBranch() {
+ Handle<Code> ic = ComputeCallMiss(arguments().immediate(), kind_);
+ __ Jump(ic, RelocInfo::CODE_TARGET);
}
@@ -977,8 +975,7 @@
// Handle call cache miss.
__ bind(&miss_in_smi_check);
- Object* obj = GenerateMissBranch();
- if (obj->IsFailure()) return obj;
+ GenerateMissBranch();
// Return the generated code.
return GetCode(function);
@@ -1032,8 +1029,7 @@
// Handle call cache miss.
__ bind(&miss);
- Object* obj = GenerateMissBranch();
- if (obj->IsFailure()) return obj;
+ GenerateMissBranch();
// Return the generated code.
return GetCode(FIELD, name);
@@ -1190,8 +1186,8 @@
}
__ bind(&miss);
- Object* obj = GenerateMissBranch();
- if (obj->IsFailure()) return obj;
+
+ GenerateMissBranch();
// Return the generated code.
return GetCode(function);
@@ -1274,8 +1270,8 @@
argc + 1,
1);
__ bind(&miss);
- Object* obj = GenerateMissBranch();
- if (obj->IsFailure()) return obj;
+
+ GenerateMissBranch();
// Return the generated code.
return GetCode(function);
@@ -1361,8 +1357,7 @@
// Handle load cache miss.
__ bind(&miss);
- Object* obj = GenerateMissBranch();
- if (obj->IsFailure()) return obj;
+ GenerateMissBranch();
// Return the generated code.
return GetCode(INTERCEPTOR, name);
@@ -1447,8 +1442,7 @@
// Handle call cache miss.
__ bind(&miss);
__ IncrementCounter(&Counters::call_global_inline_miss, 1);
- Object* obj = GenerateMissBranch();
- if (obj->IsFailure()) return obj;
+ GenerateMissBranch();
// Return the generated code.
return GetCode(NORMAL, name);
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
