diff --git a/js/src/frontend/BytecodeCompiler.cpp b/js/src/frontend/BytecodeCompiler.cpp index 68f200cf27e..1bad1a42c9f 100644 --- a/js/src/frontend/BytecodeCompiler.cpp +++ b/js/src/frontend/BytecodeCompiler.cpp @@ -10,6 +10,7 @@ #include "frontend/BytecodeEmitter.h" #include "frontend/FoldConstants.h" #include "frontend/NameFunctions.h" +#include "frontend/Parser.h" #include "ion/AsmJS.h" #include "vm/GlobalObject.h" @@ -17,7 +18,6 @@ #include "jsscriptinlines.h" #include "frontend/ParseMaps-inl.h" -#include "frontend/SharedContext-inl.h" #include "vm/ScopeObject-inl.h" using namespace js; diff --git a/js/src/frontend/BytecodeEmitter.cpp b/js/src/frontend/BytecodeEmitter.cpp index dd84e78ba0e..4501826ef13 100644 --- a/js/src/frontend/BytecodeEmitter.cpp +++ b/js/src/frontend/BytecodeEmitter.cpp @@ -38,7 +38,6 @@ #include "frontend/ParseMaps-inl.h" #include "frontend/ParseNode-inl.h" -#include "frontend/SharedContext-inl.h" using namespace js; using namespace js::gc; diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp index 39642ce4f5e..37ded056db2 100644 --- a/js/src/frontend/Parser.cpp +++ b/js/src/frontend/Parser.cpp @@ -43,7 +43,6 @@ #include "frontend/ParseMaps-inl.h" #include "frontend/ParseNode-inl.h" -#include "frontend/SharedContext-inl.h" #include "vm/NumericConversions.h" diff --git a/js/src/frontend/SharedContext-inl.h b/js/src/frontend/SharedContext-inl.h deleted file mode 100644 index b84cf942861..00000000000 --- a/js/src/frontend/SharedContext-inl.h +++ /dev/null @@ -1,25 +0,0 @@ -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- - * vim: set ts=8 sts=4 et sw=4 tw=99: - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef frontend_SharedContext_inl_h -#define frontend_SharedContext_inl_h - -#include "frontend/Parser.h" -#include "frontend/SharedContext.h" - -namespace js { -namespace frontend { - -inline bool -SharedContext::needStrictChecks() -{ - return strict || extraWarnings; -} - -} /* namespace frontend */ -} // namespace js - -#endif /* frontend_SharedContext_inl_h */ diff --git a/js/src/frontend/SharedContext.h b/js/src/frontend/SharedContext.h index 07b8846ff7f..d89ec2f31fd 100644 --- a/js/src/frontend/SharedContext.h +++ b/js/src/frontend/SharedContext.h @@ -180,7 +180,9 @@ class SharedContext void setHasDebuggerStatement() { anyCxFlags.hasDebuggerStatement = true; } // JSOPTION_EXTRA_WARNINGS warnings or strict mode errors. - inline bool needStrictChecks(); + bool needStrictChecks() { + return strict || extraWarnings; + } }; class GlobalSharedContext : public SharedContext