Index: runtime/vm/kernel_to_il.h |
diff --git a/runtime/vm/kernel_to_il.h b/runtime/vm/kernel_to_il.h |
index 2faba8879364affa0995c416d14e8ecdb6a60140..1d60daf6b6ad5e30023587213e006cb49414f2eb 100644 |
--- a/runtime/vm/kernel_to_il.h |
+++ b/runtime/vm/kernel_to_il.h |
@@ -51,7 +51,6 @@ class KernelConstMapKeyEqualsTraits { |
}; |
typedef UnorderedHashMap<KernelConstMapKeyEqualsTraits> KernelConstantsMap; |
- |
template <typename K, typename V> |
class Map : public DirectChainedHashMap<RawPointerKeyValueTrait<K, V> > { |
public: |
@@ -79,7 +78,6 @@ class Map : public DirectChainedHashMap<RawPointerKeyValueTrait<K, V> > { |
} |
}; |
- |
template <typename V> |
class IntKeyRawPointerValueTrait { |
public: |
@@ -156,7 +154,6 @@ class MallocMap |
} |
}; |
- |
class BreakableBlock; |
class CatchBlock; |
class FlowGraphBuilder; |
@@ -191,7 +188,6 @@ Fragment operator<<(const Fragment& fragment, Instruction* next); |
typedef ZoneGrowableArray<PushArgumentInstr*>* ArgumentArray; |
- |
class ActiveClass { |
public: |
ActiveClass() |
@@ -219,7 +215,6 @@ class ActiveClass { |
intptr_t member_type_parameters_offset_start; |
}; |
- |
class ActiveClassScope { |
public: |
ActiveClassScope(ActiveClass* active_class, |
@@ -241,7 +236,6 @@ class ActiveClassScope { |
ActiveClass saved_; |
}; |
- |
class ActiveMemberScope { |
public: |
ActiveMemberScope(ActiveClass* active_class, |
@@ -265,7 +259,6 @@ class ActiveMemberScope { |
ActiveClass saved_; |
}; |
- |
class TranslationHelper { |
public: |
explicit TranslationHelper(dart::Thread* thread); |
@@ -384,7 +377,6 @@ class TranslationHelper { |
dart::String* name_to_modify, |
bool symbolize = true); |
- |
Thread* thread_; |
Zone* zone_; |
Isolate* isolate_; |
@@ -395,13 +387,11 @@ class TranslationHelper { |
TypedData& canonical_names_; |
}; |
- |
struct FunctionScope { |
intptr_t kernel_offset; |
LocalScope* scope; |
}; |
- |
class ScopeBuildingResult : public ZoneAllocated { |
public: |
ScopeBuildingResult() |
@@ -452,7 +442,6 @@ class ScopeBuildingResult : public ZoneAllocated { |
GrowableArray<LocalVariable*> iterator_variables; |
}; |
- |
struct YieldContinuation { |
Instruction* entry; |
intptr_t try_index; |
@@ -693,7 +682,6 @@ class FlowGraphBuilder { |
return scopes_->catch_context_variables[try_depth_]; |
} |
- |
// A chained list of breakable blocks. Chaining and lookup is done by the |
// [BreakableBlock] class. |
BreakableBlock* breakable_block_; |
@@ -729,7 +717,6 @@ class FlowGraphBuilder { |
friend class TryFinallyBlock; |
}; |
- |
class SwitchBlock { |
public: |
SwitchBlock(FlowGraphBuilder* builder, intptr_t case_count) |
@@ -811,7 +798,6 @@ class SwitchBlock { |
intptr_t try_index_; |
}; |
- |
class TryCatchBlock { |
public: |
explicit TryCatchBlock(FlowGraphBuilder* builder, |
@@ -833,11 +819,9 @@ class TryCatchBlock { |
intptr_t try_index_; |
}; |
- |
class TryFinallyBlock { |
public: |
- TryFinallyBlock(FlowGraphBuilder* builder, |
- intptr_t finalizer_kernel_offset) |
+ TryFinallyBlock(FlowGraphBuilder* builder, intptr_t finalizer_kernel_offset) |
: builder_(builder), |
outer_(builder->try_finally_block_), |
finalizer_kernel_offset_(finalizer_kernel_offset), |
@@ -866,7 +850,6 @@ class TryFinallyBlock { |
const intptr_t try_index_; |
}; |
- |
class BreakableBlock { |
public: |
explicit BreakableBlock(FlowGraphBuilder* builder) |
@@ -946,21 +929,19 @@ class CatchBlock { |
intptr_t catch_try_index_; |
}; |
- |
RawObject* EvaluateMetadata(const dart::Field& metadata_field); |
RawObject* BuildParameterDescriptor(const Function& function); |
void CollectTokenPositionsFor(const Script& script); |
String& GetSourceFor(const Script& script); |
Array& GetLineStartsFor(const Script& script); |
- |
} // namespace kernel |
} // namespace dart |
#else // !defined(DART_PRECOMPILED_RUNTIME) |
-#include "vm/object.h" |
#include "vm/kernel.h" |
+#include "vm/object.h" |
namespace dart { |
namespace kernel { |