Revision: 23717
Author: [email protected]
Date: Fri Sep 5 08:04:37 2014 UTC
Log: Fix null-dereference in r23716.
[email protected]
Review URL: https://codereview.chromium.org/545843002
https://code.google.com/p/v8/source/detail?r=23717
Modified:
/branches/bleeding_edge/src/ic/ic.cc
/branches/bleeding_edge/src/ic/ic.h
/branches/bleeding_edge/src/type-info.cc
=======================================
--- /branches/bleeding_edge/src/ic/ic.cc Fri Sep 5 07:44:31 2014 UTC
+++ /branches/bleeding_edge/src/ic/ic.cc Fri Sep 5 08:04:37 2014 UTC
@@ -2757,16 +2757,6 @@
UNREACHABLE();
return NULL;
}
-
-
-void CompareIC::StubInfoToType(uint32_t stub_key, Type** left_type,
- Type** right_type, Type** overall_type,
- Handle<Map> map, Zone* zone) {
- CompareICStub stub(stub_key, map->GetIsolate());
- *left_type = StateToType(zone, stub.left());
- *right_type = StateToType(zone, stub.right());
- *overall_type = StateToType(zone, stub.state(), map);
-}
CompareIC::State CompareIC::NewInputState(State old_state,
=======================================
--- /branches/bleeding_edge/src/ic/ic.h Tue Sep 2 07:07:52 2014 UTC
+++ /branches/bleeding_edge/src/ic/ic.h Fri Sep 5 08:04:37 2014 UTC
@@ -846,10 +846,6 @@
static Type* StateToType(Zone* zone, State state,
Handle<Map> map = Handle<Map>());
- static void StubInfoToType(uint32_t stub_key, Type** left_type,
- Type** right_type, Type** overall_type,
- Handle<Map> map, Zone* zone);
-
CompareIC(Isolate* isolate, Token::Value op)
: IC(EXTRA_CALL_FRAME, isolate), op_(op) {}
=======================================
--- /branches/bleeding_edge/src/type-info.cc Fri Aug 22 11:43:39 2014 UTC
+++ /branches/bleeding_edge/src/type-info.cc Fri Sep 5 08:04:37 2014 UTC
@@ -195,8 +195,10 @@
}
if (code->is_compare_ic_stub()) {
- CompareIC::StubInfoToType(code->stub_key(), left_type, right_type,
- combined_type, map, zone());
+ CompareICStub stub(code->stub_key(), isolate());
+ *left_type = CompareIC::StateToType(zone(), stub.left());
+ *right_type = CompareIC::StateToType(zone(), stub.right());
+ *combined_type = CompareIC::StateToType(zone(), stub.state(), map);
} else if (code->is_compare_nil_ic_stub()) {
CompareNilICStub stub(isolate(), code->extra_ic_state());
*combined_type = stub.GetType(zone(), map);
--
--
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.
