summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-06-26 12:00:26 +0000
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-06-26 12:00:26 +0000
commite4ae95acc6dcf60e4dae488df5b3b293d3759c8b (patch)
tree5b84ec7dac22ff961bda87216d0c7ff984f2ccf5
parent06bf5d769f33d72441825fa39e00baf9eaaac179 (diff)
downloadUXP-e4ae95acc6dcf60e4dae488df5b3b293d3759c8b.tar
UXP-e4ae95acc6dcf60e4dae488df5b3b293d3759c8b.tar.gz
UXP-e4ae95acc6dcf60e4dae488df5b3b293d3759c8b.tar.lz
UXP-e4ae95acc6dcf60e4dae488df5b3b293d3759c8b.tar.xz
UXP-e4ae95acc6dcf60e4dae488df5b3b293d3759c8b.zip
Remove anyNewScript()
-rw-r--r--js/src/vm/ObjectGroup.h1
-rw-r--r--js/src/vm/TypeInference.cpp14
2 files changed, 3 insertions, 12 deletions
diff --git a/js/src/vm/ObjectGroup.h b/js/src/vm/ObjectGroup.h
index 0439b4c21..0b6eaee51 100644
--- a/js/src/vm/ObjectGroup.h
+++ b/js/src/vm/ObjectGroup.h
@@ -174,7 +174,6 @@ class ObjectGroup : public gc::TenuredCell
return nullptr;
}
- TypeNewScript* anyNewScript();
void detachNewScript(bool writeBarrier, ObjectGroup* replacement);
ObjectGroupFlags flagsDontCheckGeneration() const {
diff --git a/js/src/vm/TypeInference.cpp b/js/src/vm/TypeInference.cpp
index 26ade2948..ba809fc4e 100644
--- a/js/src/vm/TypeInference.cpp
+++ b/js/src/vm/TypeInference.cpp
@@ -2877,14 +2877,6 @@ ObjectGroup::markUnknown(ExclusiveContext* cx)
}
}
-TypeNewScript*
-ObjectGroup::anyNewScript()
-{
- if (newScript())
- return newScript();
- return nullptr;
-}
-
void
ObjectGroup::detachNewScript(bool writeBarrier, ObjectGroup* replacement)
{
@@ -2892,7 +2884,7 @@ ObjectGroup::detachNewScript(bool writeBarrier, ObjectGroup* replacement)
// analyzed, remove it from the newObjectGroups table so that it will not be
// produced by calling 'new' on the associated function anymore.
// The TypeNewScript is not actually destroyed.
- TypeNewScript* newScript = anyNewScript();
+ TypeNewScript* newScript = this->newScript();
MOZ_ASSERT(newScript);
if (newScript->analyzed()) {
@@ -2922,7 +2914,7 @@ ObjectGroup::maybeClearNewScriptOnOOM()
if (!isMarked())
return;
- TypeNewScript* newScript = anyNewScript();
+ TypeNewScript* newScript = this->newScript();
if (!newScript)
return;
@@ -2937,7 +2929,7 @@ ObjectGroup::maybeClearNewScriptOnOOM()
void
ObjectGroup::clearNewScript(ExclusiveContext* cx, ObjectGroup* replacement /* = nullptr*/)
{
- TypeNewScript* newScript = anyNewScript();
+ TypeNewScript* newScript = this->newScript();
if (!newScript)
return;