Index: src/ic.cc |
diff --git a/src/ic.cc b/src/ic.cc |
index a9c53ba0a15b7f334f52af973bfeb67da01fce81..0fec032fd03ed6c3a2f7e640c6f1f5af228647aa 100644 |
--- a/src/ic.cc |
+++ b/src/ic.cc |
@@ -1954,8 +1954,7 @@ void CallIC::HandleMiss(Handle<Object> receiver, |
// Used from ic-<arch>.cc. |
RUNTIME_FUNCTION(CallIC_Miss) { |
- Logger::TimerEventScope timer( |
- isolate, Logger::TimerEventScope::v8_ic_miss); |
+ TimerEventScope<TimerEventIcMiss> timer(isolate); |
HandleScope scope(isolate); |
ASSERT(args.length() == 4); |
CallIC ic(isolate); |
@@ -1969,8 +1968,7 @@ RUNTIME_FUNCTION(CallIC_Miss) { |
RUNTIME_FUNCTION(CallIC_Customization_Miss) { |
- Logger::TimerEventScope timer( |
- isolate, Logger::TimerEventScope::v8_ic_miss); |
+ TimerEventScope<TimerEventIcMiss> timer(isolate); |
HandleScope scope(isolate); |
ASSERT(args.length() == 4); |
// A miss on a custom call ic always results in going megamorphic. |
@@ -1985,8 +1983,7 @@ RUNTIME_FUNCTION(CallIC_Customization_Miss) { |
// Used from ic-<arch>.cc. |
RUNTIME_FUNCTION(LoadIC_Miss) { |
- Logger::TimerEventScope timer( |
- isolate, Logger::TimerEventScope::v8_ic_miss); |
+ TimerEventScope<TimerEventIcMiss> timer(isolate); |
HandleScope scope(isolate); |
ASSERT(args.length() == 2); |
LoadIC ic(IC::NO_EXTRA_FRAME, isolate); |
@@ -2001,8 +1998,7 @@ RUNTIME_FUNCTION(LoadIC_Miss) { |
// Used from ic-<arch>.cc |
RUNTIME_FUNCTION(KeyedLoadIC_Miss) { |
- Logger::TimerEventScope timer( |
- isolate, Logger::TimerEventScope::v8_ic_miss); |
+ TimerEventScope<TimerEventIcMiss> timer(isolate); |
HandleScope scope(isolate); |
ASSERT(args.length() == 2); |
KeyedLoadIC ic(IC::NO_EXTRA_FRAME, isolate); |
@@ -2016,8 +2012,7 @@ RUNTIME_FUNCTION(KeyedLoadIC_Miss) { |
RUNTIME_FUNCTION(KeyedLoadIC_MissFromStubFailure) { |
- Logger::TimerEventScope timer( |
- isolate, Logger::TimerEventScope::v8_ic_miss); |
+ TimerEventScope<TimerEventIcMiss> timer(isolate); |
HandleScope scope(isolate); |
ASSERT(args.length() == 2); |
KeyedLoadIC ic(IC::EXTRA_CALL_FRAME, isolate); |
@@ -2032,8 +2027,7 @@ RUNTIME_FUNCTION(KeyedLoadIC_MissFromStubFailure) { |
// Used from ic-<arch>.cc. |
RUNTIME_FUNCTION(StoreIC_Miss) { |
- Logger::TimerEventScope timer( |
- isolate, Logger::TimerEventScope::v8_ic_miss); |
+ TimerEventScope<TimerEventIcMiss> timer(isolate); |
HandleScope scope(isolate); |
ASSERT(args.length() == 3); |
StoreIC ic(IC::NO_EXTRA_FRAME, isolate); |
@@ -2050,8 +2044,7 @@ RUNTIME_FUNCTION(StoreIC_Miss) { |
RUNTIME_FUNCTION(StoreIC_MissFromStubFailure) { |
- Logger::TimerEventScope timer( |
- isolate, Logger::TimerEventScope::v8_ic_miss); |
+ TimerEventScope<TimerEventIcMiss> timer(isolate); |
HandleScope scope(isolate); |
ASSERT(args.length() == 3); |
StoreIC ic(IC::EXTRA_CALL_FRAME, isolate); |
@@ -2068,8 +2061,7 @@ RUNTIME_FUNCTION(StoreIC_MissFromStubFailure) { |
RUNTIME_FUNCTION(StoreIC_ArrayLength) { |
- Logger::TimerEventScope timer( |
- isolate, Logger::TimerEventScope::v8_ic_miss); |
+ TimerEventScope<TimerEventIcMiss> timer(isolate); |
HandleScope scope(isolate); |
ASSERT(args.length() == 2); |
@@ -2096,8 +2088,7 @@ RUNTIME_FUNCTION(StoreIC_ArrayLength) { |
// it is necessary to extend the properties array of a |
// JSObject. |
RUNTIME_FUNCTION(SharedStoreIC_ExtendStorage) { |
- Logger::TimerEventScope timer( |
- isolate, Logger::TimerEventScope::v8_ic_miss); |
+ TimerEventScope<TimerEventIcMiss> timer(isolate); |
HandleScope shs(isolate); |
ASSERT(args.length() == 3); |
@@ -2119,8 +2110,7 @@ RUNTIME_FUNCTION(SharedStoreIC_ExtendStorage) { |
// Used from ic-<arch>.cc. |
RUNTIME_FUNCTION(KeyedStoreIC_Miss) { |
- Logger::TimerEventScope timer( |
- isolate, Logger::TimerEventScope::v8_ic_miss); |
+ TimerEventScope<TimerEventIcMiss> timer(isolate); |
HandleScope scope(isolate); |
ASSERT(args.length() == 3); |
KeyedStoreIC ic(IC::NO_EXTRA_FRAME, isolate); |
@@ -2137,8 +2127,7 @@ RUNTIME_FUNCTION(KeyedStoreIC_Miss) { |
RUNTIME_FUNCTION(KeyedStoreIC_MissFromStubFailure) { |
- Logger::TimerEventScope timer( |
- isolate, Logger::TimerEventScope::v8_ic_miss); |
+ TimerEventScope<TimerEventIcMiss> timer(isolate); |
HandleScope scope(isolate); |
ASSERT(args.length() == 3); |
KeyedStoreIC ic(IC::EXTRA_CALL_FRAME, isolate); |
@@ -2189,8 +2178,7 @@ RUNTIME_FUNCTION(KeyedStoreIC_Slow) { |
RUNTIME_FUNCTION(ElementsTransitionAndStoreIC_Miss) { |
- Logger::TimerEventScope timer( |
- isolate, Logger::TimerEventScope::v8_ic_miss); |
+ TimerEventScope<TimerEventIcMiss> timer(isolate); |
HandleScope scope(isolate); |
ASSERT(args.length() == 4); |
KeyedStoreIC ic(IC::EXTRA_CALL_FRAME, isolate); |
@@ -2695,8 +2683,7 @@ MaybeHandle<Object> BinaryOpIC::Transition( |
RUNTIME_FUNCTION(BinaryOpIC_Miss) { |
- Logger::TimerEventScope timer( |
- isolate, Logger::TimerEventScope::v8_ic_miss); |
+ TimerEventScope<TimerEventIcMiss> timer(isolate); |
HandleScope scope(isolate); |
ASSERT_EQ(2, args.length()); |
Handle<Object> left = args.at<Object>(BinaryOpICStub::kLeft); |
@@ -2712,8 +2699,7 @@ RUNTIME_FUNCTION(BinaryOpIC_Miss) { |
RUNTIME_FUNCTION(BinaryOpIC_MissWithAllocationSite) { |
- Logger::TimerEventScope timer( |
- isolate, Logger::TimerEventScope::v8_ic_miss); |
+ TimerEventScope<TimerEventIcMiss> timer(isolate); |
HandleScope scope(isolate); |
ASSERT_EQ(3, args.length()); |
Handle<AllocationSite> allocation_site = args.at<AllocationSite>( |
@@ -2947,8 +2933,7 @@ Code* CompareIC::UpdateCaches(Handle<Object> x, Handle<Object> y) { |
// Used from ICCompareStub::GenerateMiss in code-stubs-<arch>.cc. |
RUNTIME_FUNCTION(CompareIC_Miss) { |
- Logger::TimerEventScope timer( |
- isolate, Logger::TimerEventScope::v8_ic_miss); |
+ TimerEventScope<TimerEventIcMiss> timer(isolate); |
HandleScope scope(isolate); |
ASSERT(args.length() == 3); |
CompareIC ic(isolate, static_cast<Token::Value>(args.smi_at(2))); |
@@ -3013,8 +2998,7 @@ Handle<Object> CompareNilIC::CompareNil(Handle<Object> object) { |
RUNTIME_FUNCTION(CompareNilIC_Miss) { |
- Logger::TimerEventScope timer( |
- isolate, Logger::TimerEventScope::v8_ic_miss); |
+ TimerEventScope<TimerEventIcMiss> timer(isolate); |
HandleScope scope(isolate); |
Handle<Object> object = args.at<Object>(0); |
CompareNilIC ic(isolate); |
@@ -3080,8 +3064,7 @@ Handle<Object> ToBooleanIC::ToBoolean(Handle<Object> object) { |
RUNTIME_FUNCTION(ToBooleanIC_Miss) { |
- Logger::TimerEventScope timer( |
- isolate, Logger::TimerEventScope::v8_ic_miss); |
+ TimerEventScope<TimerEventIcMiss> timer(isolate); |
ASSERT(args.length() == 1); |
HandleScope scope(isolate); |
Handle<Object> object = args.at<Object>(0); |