corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Bug 1130708 - Remove js::types namespace, r=jandem.

Browse Source
This commit is contained in:
Brian Hackett
2015-02-08 06:01:13 -07:00
parent 6ef692e1a0
commit f3b8c29553
75 changed files with 1549 additions and 1591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
js/src/jsobj.cpp
View File

@@ -67,7 +67,6 @@
using namespace js;
using namespace js::gc;
using namespace js::types;
using mozilla::DebugOnly;
using mozilla::Maybe;
@@ -1605,7 +1604,7 @@ CreateThisForFunctionWithGroup(JSContext *cx, HandleObjectGroup group, JSObject
if (group->maybeUnboxedLayout() && newKind != SingletonObject)
return UnboxedPlainObject::create(cx, group, newKind);
if (types::TypeNewScript *newScript = group->newScript()) {
if (TypeNewScript *newScript = group->newScript()) {
if (newScript->analyzed()) {
// The definite properties analysis has been performed for this
// group, so get the shape and finalize kind to use from the
@@ -1685,7 +1684,7 @@ js::CreateThisForFunctionWithProto(JSContext *cx, HandleObject callee, JSObject
JSScript *script = callee->as<JSFunction>().getOrCreateScript(cx);
if (!script)
return nullptr;
TypeScript::SetThis(cx, script, types::Type::ObjectType(res));
TypeScript::SetThis(cx, script, TypeSet::ObjectType(res));
}
return res;
@@ -1711,7 +1710,7 @@ js::CreateThisForFunction(JSContext *cx, HandleObject callee, NewObjectKind newK
NativeObject::clear(cx, nobj);
JSScript *calleeScript = callee->as<JSFunction>().nonLazyScript();
TypeScript::SetThis(cx, calleeScript, types::Type::ObjectType(nobj));
TypeScript::SetThis(cx, calleeScript, TypeSet::ObjectType(nobj));
return nobj;
}
@@ -3335,7 +3334,7 @@ js::WatchGuts(JSContext *cx, JS::HandleObject origObj, JS::HandleId id, JS::Hand
if (!NativeObject::sparsifyDenseElements(cx, obj.as<NativeObject>()))
return false;
types::MarkTypePropertyNonData(cx, obj, id);
MarkTypePropertyNonData(cx, obj, id);
}
WatchpointMap *wpmap = cx->compartment()->watchpointMap;