Bug 1073771 - Add namespaces and whatnot to make JitMoveEmitterCycles compile. r=dougc, a=test-only
☠☠ backed out by a74478caa593 ☠ ☠
authorMarty Rosenberg <mrosenberg@mozilla.com>
Fri, 26 Sep 2014 21:48:00 -0400
changeset 225152 0f1e376278037d9971f2c2a969f30615e58a710b
parent 225151 90df4653a6552a50b631335679838b107839a0a0
child 225153 a74478caa593511cb886f56adacfc07aeafac705
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdougc, test-only
bugs1073771
milestone34.0a2
Bug 1073771 - Add namespaces and whatnot to make JitMoveEmitterCycles compile. r=dougc, a=test-only
js/src/jsapi-tests/testJitMoveEmitterCycles.cpp
--- a/js/src/jsapi-tests/testJitMoveEmitterCycles.cpp
+++ b/js/src/jsapi-tests/testJitMoveEmitterCycles.cpp
@@ -47,22 +47,24 @@ static MOZ_CONSTEXPR_VAR js::jit::FloatR
 static MOZ_CONSTEXPR_VAR js::jit::FloatRegister s25(25, js::jit::VFPRegister::Single);
 static MOZ_CONSTEXPR_VAR js::jit::FloatRegister s26(26, js::jit::VFPRegister::Single);
 static MOZ_CONSTEXPR_VAR js::jit::FloatRegister s27(27, js::jit::VFPRegister::Single);
 static MOZ_CONSTEXPR_VAR js::jit::FloatRegister s28(28, js::jit::VFPRegister::Single);
 static MOZ_CONSTEXPR_VAR js::jit::FloatRegister s29(29, js::jit::VFPRegister::Single);
 static MOZ_CONSTEXPR_VAR js::jit::FloatRegister s30(30, js::jit::VFPRegister::Single);
 static MOZ_CONSTEXPR_VAR js::jit::FloatRegister s31(31, js::jit::VFPRegister::Single);
 
-static JitCode *
-linkAndAllocate(JSContext *cx, MacroAssembler *masm)
+static js::jit::JitCode *
+linkAndAllocate(JSContext *cx, js::jit::MacroAssembler *masm)
 {
+    using namespace js;
+    using namespace js::jit;
     AutoFlushICache afc("test");
     Linker l(*masm);
-    return l.newCode<CanGC>(cx, ION_CODE);
+    return l.newCode<CanGC>(cx, JSC::ION_CODE);
 }
 
 BEGIN_TEST(testJitMoveEmitterCycles_simple)
 {
     using namespace js;
     using namespace js::jit;
     LifoAlloc lifo(LIFO_ALLOC_PRIMARY_CHUNK_SIZE);
     TempAllocator alloc(&lifo);