Bug 1073771 - Add namespaces and whatnot to make JitMoveEmitterCycles compile. r=dougc
☠☠ backed out by deb7b678cc9e ☠ ☠
authorMarty Rosenberg <mrosenberg@mozilla.com>
Fri, 26 Sep 2014 21:48:00 -0400
changeset 223021 a1fb032b02164562cbb2c3e8d8f8c7b77c335d55
parent 223020 62e3d5d264c22f1854bce402d887bb2138acdcd4
child 223022 913b6dbbfcd676dc7c0384797a61c3ca5065aaad
push id7107
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 17:43:31 +0000
treeherdermozilla-aurora@b4b34e0acc75 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdougc
bugs1073771
milestone35.0a1
Bug 1073771 - Add namespaces and whatnot to make JitMoveEmitterCycles compile. r=dougc
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);