Index: test/cctest/test-heap.cc |
diff --git a/test/cctest/test-heap.cc b/test/cctest/test-heap.cc |
index b86b96db009cade488d690739f39329fc47eb20e..bb54b0a8ee7526edece8e2756e960a666886bf35 100644 |
--- a/test/cctest/test-heap.cc |
+++ b/test/cctest/test-heap.cc |
@@ -2208,7 +2208,7 @@ TEST(OptimizedPretenuringAllocationFolding) { |
} |
i::ScopedVector<char> source(1024); |
- i::OS::SNPrintF( |
+ i::SNPrintF( |
source, |
"var number_elements = %d;" |
"var elements = new Array();" |
@@ -2257,7 +2257,7 @@ TEST(OptimizedPretenuringObjectArrayLiterals) { |
} |
i::ScopedVector<char> source(1024); |
- i::OS::SNPrintF( |
+ i::SNPrintF( |
source, |
"var number_elements = %d;" |
"var elements = new Array(number_elements);" |
@@ -2298,7 +2298,7 @@ TEST(OptimizedPretenuringMixedInObjectProperties) { |
i::ScopedVector<char> source(1024); |
- i::OS::SNPrintF( |
+ i::SNPrintF( |
source, |
"var number_elements = %d;" |
"var elements = new Array(number_elements);" |
@@ -2348,7 +2348,7 @@ TEST(OptimizedPretenuringDoubleArrayProperties) { |
} |
i::ScopedVector<char> source(1024); |
- i::OS::SNPrintF( |
+ i::SNPrintF( |
source, |
"var number_elements = %d;" |
"var elements = new Array(number_elements);" |
@@ -2388,7 +2388,7 @@ TEST(OptimizedPretenuringdoubleArrayLiterals) { |
} |
i::ScopedVector<char> source(1024); |
- i::OS::SNPrintF( |
+ i::SNPrintF( |
source, |
"var number_elements = %d;" |
"var elements = new Array(number_elements);" |
@@ -2428,7 +2428,7 @@ TEST(OptimizedPretenuringNestedMixedArrayLiterals) { |
} |
i::ScopedVector<char> source(1024); |
- i::OS::SNPrintF( |
+ i::SNPrintF( |
source, |
"var number_elements = 100;" |
"var elements = new Array(number_elements);" |
@@ -2441,8 +2441,7 @@ TEST(OptimizedPretenuringNestedMixedArrayLiterals) { |
"f(); gc();" |
"f(); f();" |
"%%OptimizeFunctionOnNextCall(f);" |
- "f();", |
- AllocationSite::kPretenureMinimumCreated); |
+ "f();"); |
v8::Local<v8::Value> res = CompileRun(source.start()); |
@@ -2477,7 +2476,7 @@ TEST(OptimizedPretenuringNestedObjectLiterals) { |
} |
i::ScopedVector<char> source(1024); |
- i::OS::SNPrintF( |
+ i::SNPrintF( |
source, |
"var number_elements = %d;" |
"var elements = new Array(number_elements);" |
@@ -2526,7 +2525,7 @@ TEST(OptimizedPretenuringNestedDoubleLiterals) { |
} |
i::ScopedVector<char> source(1024); |
- i::OS::SNPrintF( |
+ i::SNPrintF( |
source, |
"var number_elements = %d;" |
"var elements = new Array(number_elements);" |
@@ -2586,7 +2585,7 @@ TEST(OptimizedPretenuringConstructorCalls) { |
// Call new is doing slack tracking for the first |
// JSFunction::kGenerousAllocationCount allocations, and we can't find |
// mementos during that time. |
- i::OS::SNPrintF( |
+ i::SNPrintF( |
source, |
"var number_elements = %d;" |
"var elements = new Array(number_elements);" |
@@ -2637,7 +2636,7 @@ TEST(OptimizedPretenuringCallNew) { |
// Call new is doing slack tracking for the first |
// JSFunction::kGenerousAllocationCount allocations, and we can't find |
// mementos during that time. |
- i::OS::SNPrintF( |
+ i::SNPrintF( |
source, |
"var number_elements = %d;" |
"var elements = new Array(number_elements);" |
@@ -2710,7 +2709,7 @@ TEST(Regress1465) { |
AlwaysAllocateScope always_allocate(CcTest::i_isolate()); |
for (int i = 0; i < transitions_count; i++) { |
EmbeddedVector<char, 64> buffer; |
- OS::SNPrintF(buffer, "var o = new F; o.prop%d = %d;", i, i); |
+ SNPrintF(buffer, "var o = new F; o.prop%d = %d;", i, i); |
CompileRun(buffer.start()); |
} |
CompileRun("var root = new F;"); |
@@ -2742,7 +2741,7 @@ static void AddTransitions(int transitions_count) { |
AlwaysAllocateScope always_allocate(CcTest::i_isolate()); |
for (int i = 0; i < transitions_count; i++) { |
EmbeddedVector<char, 64> buffer; |
- OS::SNPrintF(buffer, "var o = new F; o.prop%d = %d;", i, i); |
+ SNPrintF(buffer, "var o = new F; o.prop%d = %d;", i, i); |
CompileRun(buffer.start()); |
} |
} |
@@ -3981,16 +3980,16 @@ TEST(NoWeakHashTableLeakWithIncrementalMarking) { |
LocalContext context; |
HandleScope scope(heap->isolate()); |
EmbeddedVector<char, 256> source; |
- OS::SNPrintF(source, |
- "function bar%d() {" |
- " return foo%d(1);" |
- "};" |
- "function foo%d(x) { with (x) { return 1 + x; } };" |
- "bar%d();" |
- "bar%d();" |
- "bar%d();" |
- "%OptimizeFunctionOnNextCall(bar%d);" |
- "bar%d();", i, i, i, i, i, i, i, i); |
+ SNPrintF(source, |
+ "function bar%d() {" |
+ " return foo%d(1);" |
+ "};" |
+ "function foo%d(x) { with (x) { return 1 + x; } };" |
+ "bar%d();" |
+ "bar%d();" |
+ "bar%d();" |
+ "%%OptimizeFunctionOnNextCall(bar%d);" |
+ "bar%d();", i, i, i, i, i, i, i, i); |
CompileRun(source.start()); |
} |
heap->CollectAllGarbage(i::Heap::kNoGCFlags); |
@@ -4006,11 +4005,11 @@ TEST(NoWeakHashTableLeakWithIncrementalMarking) { |
static Handle<JSFunction> OptimizeDummyFunction(const char* name) { |
EmbeddedVector<char, 256> source; |
- OS::SNPrintF(source, |
- "function %s() { return 0; }" |
- "%s(); %s();" |
- "%%OptimizeFunctionOnNextCall(%s);" |
- "%s();", name, name, name, name, name); |
+ SNPrintF(source, |
+ "function %s() { return 0; }" |
+ "%s(); %s();" |
+ "%%OptimizeFunctionOnNextCall(%s);" |
+ "%s();", name, name, name, name, name); |
CompileRun(source.start()); |
Handle<JSFunction> fun = |
v8::Utils::OpenHandle( |