Index: src/func-name-inferrer.h |
diff --git a/src/func-name-inferrer.h b/src/func-name-inferrer.h |
index f0fdbd22e021bd281e7e0b2f01ae8985c3574917..e6947d0ed1b24c9c52364fc7dfbbd0569040b264 100644 |
--- a/src/func-name-inferrer.h |
+++ b/src/func-name-inferrer.h |
@@ -11,8 +11,9 @@ |
namespace v8 { |
namespace internal { |
+class AstString; |
+class AstStringTable; |
class FunctionLiteral; |
-class Isolate; |
// FuncNameInferrer is a stateful class that is used to perform name |
// inference for anonymous functions during static analysis of source code. |
@@ -26,13 +27,13 @@ class Isolate; |
// a name. |
class FuncNameInferrer : public ZoneObject { |
public: |
- FuncNameInferrer(Isolate* isolate, Zone* zone); |
+ FuncNameInferrer(AstStringTable* string_table, Zone* zone); |
// Returns whether we have entered name collection state. |
bool IsOpen() const { return !entries_stack_.is_empty(); } |
// Pushes an enclosing the name of enclosing function onto names stack. |
- void PushEnclosingName(Handle<String> name); |
+ void PushEnclosingName(const AstString* name); |
// Enters name collection state. |
void Enter() { |
@@ -40,9 +41,9 @@ class FuncNameInferrer : public ZoneObject { |
} |
// Pushes an encountered name onto names stack when in collection state. |
- void PushLiteralName(Handle<String> name); |
+ void PushLiteralName(const AstString* name); |
- void PushVariableName(Handle<String> name); |
+ void PushVariableName(const AstString* name); |
// Adds a function to infer name for. |
void AddFunction(FunctionLiteral* func_to_infer) { |
@@ -80,24 +81,20 @@ class FuncNameInferrer : public ZoneObject { |
kVariableName |
}; |
struct Name { |
- Name(Handle<String> name, NameType type) : name(name), type(type) { } |
- Handle<String> name; |
+ Name(const AstString* name, NameType type) : name(name), type(type) {} |
+ const AstString* name; |
NameType type; |
}; |
- Isolate* isolate() { return isolate_; } |
Zone* zone() const { return zone_; } |
// Constructs a full name in dotted notation from gathered names. |
- Handle<String> MakeNameFromStack(); |
- |
- // A helper function for MakeNameFromStack. |
- Handle<String> MakeNameFromStackHelper(int pos, Handle<String> prev); |
+ const AstString* MakeNameFromStack(); |
// Performs name inferring for added functions. |
void InferFunctionsNames(); |
- Isolate* isolate_; |
+ AstStringTable* string_table_; |
ZoneList<int> entries_stack_; |
ZoneList<Name> names_stack_; |
ZoneList<FunctionLiteral*> funcs_to_infer_; |