Commit 2662bbc2 authored by Ross McIlroy's avatar Ross McIlroy Committed by Commit Bot

[Parsing] Remove PreParseData which is no longer used.

TBR=yangguo@chromium.org

Change-Id: Iadeb5828daf4db341c58534ff2b23141f241dfb9
Reviewed-on: https://chromium-review.googlesource.com/1184841
Commit-Queue: Ross McIlroy <rmcilroy@chromium.org>
Reviewed-by: 's avatarMarja Hölttä <marja@chromium.org>
Cr-Commit-Position: refs/heads/master@{#55314}
parent 97ba0ac1
...@@ -2264,10 +2264,9 @@ v8_source_set("v8_base") { ...@@ -2264,10 +2264,9 @@ v8_source_set("v8_base") {
"src/parsing/parsing.cc", "src/parsing/parsing.cc",
"src/parsing/parsing.h", "src/parsing/parsing.h",
"src/parsing/pattern-rewriter.cc", "src/parsing/pattern-rewriter.cc",
"src/parsing/preparse-data.cc",
"src/parsing/preparse-data.h",
"src/parsing/preparsed-scope-data.cc", "src/parsing/preparsed-scope-data.cc",
"src/parsing/preparsed-scope-data.h", "src/parsing/preparsed-scope-data.h",
"src/parsing/preparser-logger.h",
"src/parsing/preparser.cc", "src/parsing/preparser.cc",
"src/parsing/preparser.h", "src/parsing/preparser.h",
"src/parsing/rewriter.cc", "src/parsing/rewriter.cc",
......
...@@ -1078,7 +1078,6 @@ enum InitializationFlag : uint8_t { kNeedsInitialization, kCreatedInitialized }; ...@@ -1078,7 +1078,6 @@ enum InitializationFlag : uint8_t { kNeedsInitialization, kCreatedInitialized };
enum MaybeAssignedFlag : uint8_t { kNotAssigned, kMaybeAssigned }; enum MaybeAssignedFlag : uint8_t { kNotAssigned, kMaybeAssigned };
// Serialized in PreparseData, so numeric values should not be changed.
enum ParseErrorType { kSyntaxError = 0, kReferenceError = 1 }; enum ParseErrorType { kSyntaxError = 0, kReferenceError = 1 };
enum FunctionKind : uint8_t { enum FunctionKind : uint8_t {
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include "src/globals.h" #include "src/globals.h"
#include "src/parsing/parser-base.h" #include "src/parsing/parser-base.h"
#include "src/parsing/parsing.h" #include "src/parsing/parsing.h"
#include "src/parsing/preparse-data.h"
#include "src/parsing/preparser.h" #include "src/parsing/preparser.h"
#include "src/utils.h" #include "src/utils.h"
#include "src/zone/zone-chunk-list.h" #include "src/zone/zone-chunk-list.h"
......
// Copyright 2010 the V8 project authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "src/parsing/preparse-data.h"
#include "src/base/hashmap.h"
#include "src/base/logging.h"
#include "src/globals.h"
#include "src/objects-inl.h"
#include "src/parsing/parser.h"
namespace v8 {
namespace internal {
PreParseData::FunctionData PreParseData::GetFunctionData(int start) const {
auto it = functions_.find(start);
if (it != functions_.end()) {
return it->second;
}
return FunctionData();
}
void PreParseData::AddFunctionData(int start, FunctionData&& data) {
DCHECK(data.is_valid());
functions_[start] = std::move(data);
}
void PreParseData::AddFunctionData(int start, const FunctionData& data) {
DCHECK(data.is_valid());
functions_[start] = data;
}
size_t PreParseData::size() const { return functions_.size(); }
PreParseData::const_iterator PreParseData::begin() const {
return functions_.begin();
}
PreParseData::const_iterator PreParseData::end() const {
return functions_.end();
}
} // namespace internal
} // namespace v8.
// Copyright 2011 the V8 project authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef V8_PARSING_PREPARSE_DATA_H_
#define V8_PARSING_PREPARSE_DATA_H_
#include <unordered_map>
#include "src/allocation.h"
#include "src/base/hashmap.h"
#include "src/collector.h"
#include "src/messages.h"
namespace v8 {
namespace internal {
class PreParserLogger final {
public:
PreParserLogger()
: end_(-1),
num_parameters_(-1),
num_inner_functions_(-1) {}
void LogFunction(int end, int num_parameters, int num_inner_functions) {
end_ = end;
num_parameters_ = num_parameters;
num_inner_functions_ = num_inner_functions;
}
int end() const { return end_; }
int num_parameters() const {
return num_parameters_;
}
int num_inner_functions() const { return num_inner_functions_; }
private:
int end_;
// For function entries.
int num_parameters_;
int num_inner_functions_;
};
class PreParseData final {
public:
struct FunctionData {
int end;
int num_parameters;
int num_inner_functions;
LanguageMode language_mode;
bool uses_super_property : 1;
FunctionData() : end(kNoSourcePosition) {}
FunctionData(int end, int num_parameters, int num_inner_functions,
LanguageMode language_mode, bool uses_super_property)
: end(end),
num_parameters(num_parameters),
num_inner_functions(num_inner_functions),
language_mode(language_mode),
uses_super_property(uses_super_property) {}
bool is_valid() const {
DCHECK_IMPLIES(end < 0, end == kNoSourcePosition);
return end != kNoSourcePosition;
}
};
FunctionData GetFunctionData(int start) const;
void AddFunctionData(int start, FunctionData&& data);
void AddFunctionData(int start, const FunctionData& data);
size_t size() const;
typedef std::unordered_map<int, FunctionData>::const_iterator const_iterator;
const_iterator begin() const;
const_iterator end() const;
private:
std::unordered_map<int, FunctionData> functions_;
};
} // namespace internal
} // namespace v8.
#endif // V8_PARSING_PREPARSE_DATA_H_
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
#include "src/globals.h" #include "src/globals.h"
#include "src/handles.h" #include "src/handles.h"
#include "src/objects/shared-function-info.h" #include "src/objects/shared-function-info.h"
#include "src/parsing/preparse-data.h"
#include "src/zone/zone-chunk-list.h" #include "src/zone/zone-chunk-list.h"
namespace v8 { namespace v8 {
......
// Copyright 2018 the V8 project authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef V8_PARSING_PREPARSER_LOGGER_H_
#define V8_PARSING_PREPARSER_LOGGER_H_
namespace v8 {
namespace internal {
class PreParserLogger final {
public:
PreParserLogger() : end_(-1), num_parameters_(-1), num_inner_functions_(-1) {}
void LogFunction(int end, int num_parameters, int num_inner_functions) {
end_ = end;
num_parameters_ = num_parameters;
num_inner_functions_ = num_inner_functions;
}
int end() const { return end_; }
int num_parameters() const { return num_parameters_; }
int num_inner_functions() const { return num_inner_functions_; }
private:
int end_;
// For function entries.
int num_parameters_;
int num_inner_functions_;
};
} // namespace internal
} // namespace v8.
#endif // V8_PARSING_PREPARSER_LOGGER_H_
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
#include "src/globals.h" #include "src/globals.h"
#include "src/parsing/duplicate-finder.h" #include "src/parsing/duplicate-finder.h"
#include "src/parsing/parser-base.h" #include "src/parsing/parser-base.h"
#include "src/parsing/preparse-data.h"
#include "src/parsing/preparsed-scope-data.h" #include "src/parsing/preparsed-scope-data.h"
#include "src/parsing/preparser.h" #include "src/parsing/preparser.h"
#include "src/unicode.h" #include "src/unicode.h"
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "src/ast/ast.h" #include "src/ast/ast.h"
#include "src/ast/scopes.h" #include "src/ast/scopes.h"
#include "src/parsing/parser-base.h" #include "src/parsing/parser-base.h"
#include "src/parsing/preparse-data.h" #include "src/parsing/preparser-logger.h"
#include "src/pending-compilation-error-handler.h" #include "src/pending-compilation-error-handler.h"
namespace v8 { namespace v8 {
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
#ifndef V8_SNAPSHOT_CODE_SERIALIZER_H_ #ifndef V8_SNAPSHOT_CODE_SERIALIZER_H_
#define V8_SNAPSHOT_CODE_SERIALIZER_H_ #define V8_SNAPSHOT_CODE_SERIALIZER_H_
#include "src/parsing/preparse-data.h"
#include "src/snapshot/serializer.h" #include "src/snapshot/serializer.h"
namespace v8 { namespace v8 {
......
...@@ -55,7 +55,6 @@ ...@@ -55,7 +55,6 @@
#include "src/objects/js-array-buffer-inl.h" #include "src/objects/js-array-buffer-inl.h"
#include "src/objects/js-array-inl.h" #include "src/objects/js-array-inl.h"
#include "src/objects/js-promise-inl.h" #include "src/objects/js-promise-inl.h"
#include "src/parsing/preparse-data.h"
#include "src/profiler/cpu-profiler.h" #include "src/profiler/cpu-profiler.h"
#include "src/unicode-inl.h" #include "src/unicode-inl.h"
#include "src/utils.h" #include "src/utils.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment