Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(131)

Unified Diff: runtime/vm/clustered_snapshot.cc

Issue 2974233002: VM: Re-format to use at most one newline between functions (Closed)
Patch Set: Rebase and merge Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/clustered_snapshot.h ('k') | runtime/vm/code_descriptors.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/clustered_snapshot.cc
diff --git a/runtime/vm/clustered_snapshot.cc b/runtime/vm/clustered_snapshot.cc
index a5346975c0b9972b38066db3c30421f50ddb3e45..1b00aae8a28aac026e3e6dc82a6c98ffd005ea2e 100644
--- a/runtime/vm/clustered_snapshot.cc
+++ b/runtime/vm/clustered_snapshot.cc
@@ -33,7 +33,6 @@ static RawObject* AllocateUninitialized(PageSpace* old_space, intptr_t size) {
return reinterpret_cast<RawObject*>(address + kHeapObjectTag);
}
-
void Deserializer::InitializeHeader(RawObject* raw,
intptr_t class_id,
intptr_t size,
@@ -51,7 +50,6 @@ void Deserializer::InitializeHeader(RawObject* raw,
#endif
}
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class ClassSerializationCluster : public SerializationCluster {
public:
@@ -136,7 +134,6 @@ class ClassSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class ClassDeserializationCluster : public DeserializationCluster {
public:
ClassDeserializationCluster() {}
@@ -251,7 +248,6 @@ class ClassDeserializationCluster : public DeserializationCluster {
intptr_t predefined_stop_index_;
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class UnresolvedClassSerializationCluster : public SerializationCluster {
public:
@@ -298,7 +294,6 @@ class UnresolvedClassSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class UnresolvedClassDeserializationCluster : public DeserializationCluster {
public:
UnresolvedClassDeserializationCluster() {}
@@ -334,7 +329,6 @@ class UnresolvedClassDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class TypeArgumentsSerializationCluster : public SerializationCluster {
public:
@@ -385,7 +379,6 @@ class TypeArgumentsSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class TypeArgumentsDeserializationCluster : public DeserializationCluster {
public:
TypeArgumentsDeserializationCluster() {}
@@ -426,7 +419,6 @@ class TypeArgumentsDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class PatchClassSerializationCluster : public SerializationCluster {
public:
@@ -471,7 +463,6 @@ class PatchClassSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class PatchClassDeserializationCluster : public DeserializationCluster {
public:
PatchClassDeserializationCluster() {}
@@ -504,7 +495,6 @@ class PatchClassDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class FunctionSerializationCluster : public SerializationCluster {
public:
@@ -586,7 +576,6 @@ class FunctionSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class FunctionDeserializationCluster : public DeserializationCluster {
public:
FunctionDeserializationCluster() {}
@@ -697,7 +686,6 @@ class FunctionDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class ClosureDataSerializationCluster : public SerializationCluster {
public:
@@ -744,7 +732,6 @@ class ClosureDataSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class ClosureDataDeserializationCluster : public DeserializationCluster {
public:
ClosureDataDeserializationCluster() {}
@@ -782,7 +769,6 @@ class ClosureDataDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class SignatureDataSerializationCluster : public SerializationCluster {
public:
@@ -827,7 +813,6 @@ class SignatureDataSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class SignatureDataDeserializationCluster : public DeserializationCluster {
public:
SignatureDataDeserializationCluster() {}
@@ -860,7 +845,6 @@ class SignatureDataDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class RedirectionDataSerializationCluster : public SerializationCluster {
public:
@@ -905,7 +889,6 @@ class RedirectionDataSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class RedirectionDataDeserializationCluster : public DeserializationCluster {
public:
RedirectionDataDeserializationCluster() {}
@@ -940,7 +923,6 @@ class RedirectionDataDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class FieldSerializationCluster : public SerializationCluster {
public:
@@ -1050,7 +1032,6 @@ class FieldSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class FieldDeserializationCluster : public DeserializationCluster {
public:
FieldDeserializationCluster() {}
@@ -1116,7 +1097,6 @@ class FieldDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class LiteralTokenSerializationCluster : public SerializationCluster {
public:
@@ -1162,7 +1142,6 @@ class LiteralTokenSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class LiteralTokenDeserializationCluster : public DeserializationCluster {
public:
LiteralTokenDeserializationCluster() {}
@@ -1196,7 +1175,6 @@ class LiteralTokenDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class TokenStreamSerializationCluster : public SerializationCluster {
public:
@@ -1241,7 +1219,6 @@ class TokenStreamSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class TokenStreamDeserializationCluster : public DeserializationCluster {
public:
TokenStreamDeserializationCluster() {}
@@ -1274,7 +1251,6 @@ class TokenStreamDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class ScriptSerializationCluster : public SerializationCluster {
public:
@@ -1324,7 +1300,6 @@ class ScriptSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class ScriptDeserializationCluster : public DeserializationCluster {
public:
ScriptDeserializationCluster() {}
@@ -1366,7 +1341,6 @@ class ScriptDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class LibrarySerializationCluster : public SerializationCluster {
public:
@@ -1418,7 +1392,6 @@ class LibrarySerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class LibraryDeserializationCluster : public DeserializationCluster {
public:
LibraryDeserializationCluster() {}
@@ -1464,7 +1437,6 @@ class LibraryDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class NamespaceSerializationCluster : public SerializationCluster {
public:
@@ -1509,7 +1481,6 @@ class NamespaceSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class NamespaceDeserializationCluster : public DeserializationCluster {
public:
NamespaceDeserializationCluster() {}
@@ -1541,7 +1512,6 @@ class NamespaceDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class CodeSerializationCluster : public SerializationCluster {
public:
@@ -1651,7 +1621,6 @@ class CodeSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class CodeDeserializationCluster : public DeserializationCluster {
public:
CodeDeserializationCluster() {}
@@ -1746,7 +1715,6 @@ class CodeDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class ObjectPoolSerializationCluster : public SerializationCluster {
public:
@@ -1835,7 +1803,6 @@ class ObjectPoolSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class ObjectPoolDeserializationCluster : public DeserializationCluster {
public:
ObjectPoolDeserializationCluster() {}
@@ -1899,7 +1866,6 @@ class ObjectPoolDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
// PcDescriptor, StackMap, OneByteString, TwoByteString
class RODataSerializationCluster : public SerializationCluster {
@@ -1953,7 +1919,6 @@ class RODataSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class RODataDeserializationCluster : public DeserializationCluster {
public:
RODataDeserializationCluster() {}
@@ -1972,7 +1937,6 @@ class RODataDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class ExceptionHandlersSerializationCluster : public SerializationCluster {
public:
@@ -2017,7 +1981,6 @@ class ExceptionHandlersSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class ExceptionHandlersDeserializationCluster : public DeserializationCluster {
public:
ExceptionHandlersDeserializationCluster() {}
@@ -2103,7 +2066,6 @@ class ContextSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class ContextDeserializationCluster : public DeserializationCluster {
public:
ContextDeserializationCluster() {}
@@ -2138,7 +2100,6 @@ class ContextDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class ContextScopeSerializationCluster : public SerializationCluster {
public:
@@ -2189,7 +2150,6 @@ class ContextScopeSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class ContextScopeDeserializationCluster : public DeserializationCluster {
public:
ContextScopeDeserializationCluster() {}
@@ -2227,7 +2187,6 @@ class ContextScopeDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class UnlinkedCallSerializationCluster : public SerializationCluster {
public:
@@ -2272,7 +2231,6 @@ class UnlinkedCallSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class UnlinkedCallDeserializationCluster : public DeserializationCluster {
public:
UnlinkedCallDeserializationCluster() {}
@@ -2307,7 +2265,6 @@ class UnlinkedCallDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class ICDataSerializationCluster : public SerializationCluster {
public:
@@ -2360,7 +2317,6 @@ class ICDataSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class ICDataDeserializationCluster : public DeserializationCluster {
public:
ICDataDeserializationCluster() {}
@@ -2402,7 +2358,6 @@ class ICDataDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class MegamorphicCacheSerializationCluster : public SerializationCluster {
public:
@@ -2448,7 +2403,6 @@ class MegamorphicCacheSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class MegamorphicCacheDeserializationCluster : public DeserializationCluster {
public:
MegamorphicCacheDeserializationCluster() {}
@@ -2484,7 +2438,6 @@ class MegamorphicCacheDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class SubtypeTestCacheSerializationCluster : public SerializationCluster {
public:
@@ -2520,7 +2473,6 @@ class SubtypeTestCacheSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class SubtypeTestCacheDeserializationCluster : public DeserializationCluster {
public:
SubtypeTestCacheDeserializationCluster() {}
@@ -2551,7 +2503,6 @@ class SubtypeTestCacheDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class LanguageErrorSerializationCluster : public SerializationCluster {
public:
@@ -2599,7 +2550,6 @@ class LanguageErrorSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class LanguageErrorDeserializationCluster : public DeserializationCluster {
public:
LanguageErrorDeserializationCluster() {}
@@ -2636,7 +2586,6 @@ class LanguageErrorDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class UnhandledExceptionSerializationCluster : public SerializationCluster {
public:
@@ -2681,7 +2630,6 @@ class UnhandledExceptionSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class UnhandledExceptionDeserializationCluster : public DeserializationCluster {
public:
UnhandledExceptionDeserializationCluster() {}
@@ -2716,7 +2664,6 @@ class UnhandledExceptionDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class InstanceSerializationCluster : public SerializationCluster {
public:
@@ -2781,7 +2728,6 @@ class InstanceSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class InstanceDeserializationCluster : public DeserializationCluster {
public:
explicit InstanceDeserializationCluster(intptr_t cid) : cid_(cid) {}
@@ -2835,7 +2781,6 @@ class InstanceDeserializationCluster : public DeserializationCluster {
intptr_t instance_size_in_words_;
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class LibraryPrefixSerializationCluster : public SerializationCluster {
public:
@@ -2883,7 +2828,6 @@ class LibraryPrefixSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class LibraryPrefixDeserializationCluster : public DeserializationCluster {
public:
LibraryPrefixDeserializationCluster() {}
@@ -2927,7 +2871,6 @@ class LibraryPrefixDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class TypeSerializationCluster : public SerializationCluster {
public:
@@ -3006,7 +2949,6 @@ class TypeSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class TypeDeserializationCluster : public DeserializationCluster {
public:
TypeDeserializationCluster() {}
@@ -3065,7 +3007,6 @@ class TypeDeserializationCluster : public DeserializationCluster {
intptr_t canonical_stop_index_;
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class TypeRefSerializationCluster : public SerializationCluster {
public:
@@ -3110,7 +3051,6 @@ class TypeRefSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class TypeRefDeserializationCluster : public DeserializationCluster {
public:
TypeRefDeserializationCluster() {}
@@ -3142,7 +3082,6 @@ class TypeRefDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class TypeParameterSerializationCluster : public SerializationCluster {
public:
@@ -3192,7 +3131,6 @@ class TypeParameterSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class TypeParameterDeserializationCluster : public DeserializationCluster {
public:
TypeParameterDeserializationCluster() {}
@@ -3229,7 +3167,6 @@ class TypeParameterDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class BoundedTypeSerializationCluster : public SerializationCluster {
public:
@@ -3274,7 +3211,6 @@ class BoundedTypeSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class BoundedTypeDeserializationCluster : public DeserializationCluster {
public:
BoundedTypeDeserializationCluster() {}
@@ -3307,7 +3243,6 @@ class BoundedTypeDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class ClosureSerializationCluster : public SerializationCluster {
public:
@@ -3353,7 +3288,6 @@ class ClosureSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class ClosureDeserializationCluster : public DeserializationCluster {
public:
ClosureDeserializationCluster() {}
@@ -3387,7 +3321,6 @@ class ClosureDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class MintSerializationCluster : public SerializationCluster {
public:
@@ -3430,7 +3363,6 @@ class MintSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class MintDeserializationCluster : public DeserializationCluster {
public:
MintDeserializationCluster() {}
@@ -3482,7 +3414,6 @@ class MintDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class BigintSerializationCluster : public SerializationCluster {
public:
@@ -3528,7 +3459,6 @@ class BigintSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class BigintDeserializationCluster : public DeserializationCluster {
public:
BigintDeserializationCluster() {}
@@ -3561,7 +3491,6 @@ class BigintDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class DoubleSerializationCluster : public SerializationCluster {
public:
@@ -3597,7 +3526,6 @@ class DoubleSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class DoubleDeserializationCluster : public DeserializationCluster {
public:
DoubleDeserializationCluster() {}
@@ -3626,7 +3554,6 @@ class DoubleDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class GrowableObjectArraySerializationCluster : public SerializationCluster {
public:
@@ -3672,7 +3599,6 @@ class GrowableObjectArraySerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class GrowableObjectArrayDeserializationCluster
: public DeserializationCluster {
public:
@@ -3709,7 +3635,6 @@ class GrowableObjectArrayDeserializationCluster
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class TypedDataSerializationCluster : public SerializationCluster {
public:
@@ -3752,7 +3677,6 @@ class TypedDataSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class TypedDataDeserializationCluster : public DeserializationCluster {
public:
explicit TypedDataDeserializationCluster(intptr_t cid) : cid_(cid) {}
@@ -3793,7 +3717,6 @@ class TypedDataDeserializationCluster : public DeserializationCluster {
const intptr_t cid_;
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class ExternalTypedDataSerializationCluster : public SerializationCluster {
public:
@@ -3834,7 +3757,6 @@ class ExternalTypedDataSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class ExternalTypedDataDeserializationCluster : public DeserializationCluster {
public:
explicit ExternalTypedDataDeserializationCluster(intptr_t cid) : cid_(cid) {}
@@ -3872,7 +3794,6 @@ class ExternalTypedDataDeserializationCluster : public DeserializationCluster {
const intptr_t cid_;
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class StackTraceSerializationCluster : public SerializationCluster {
public:
@@ -3917,7 +3838,6 @@ class StackTraceSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class StackTraceDeserializationCluster : public DeserializationCluster {
public:
StackTraceDeserializationCluster() {}
@@ -3950,7 +3870,6 @@ class StackTraceDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class RegExpSerializationCluster : public SerializationCluster {
public:
@@ -3998,7 +3917,6 @@ class RegExpSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class RegExpDeserializationCluster : public DeserializationCluster {
public:
RegExpDeserializationCluster() {}
@@ -4033,7 +3951,6 @@ class RegExpDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class WeakPropertySerializationCluster : public SerializationCluster {
public:
@@ -4078,7 +3995,6 @@ class WeakPropertySerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class WeakPropertyDeserializationCluster : public DeserializationCluster {
public:
WeakPropertyDeserializationCluster() {}
@@ -4113,7 +4029,6 @@ class WeakPropertyDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class LinkedHashMapSerializationCluster : public SerializationCluster {
public:
@@ -4182,7 +4097,6 @@ class LinkedHashMapSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class LinkedHashMapDeserializationCluster : public DeserializationCluster {
public:
LinkedHashMapDeserializationCluster() {}
@@ -4241,7 +4155,6 @@ class LinkedHashMapDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class ArraySerializationCluster : public SerializationCluster {
public:
@@ -4291,7 +4204,6 @@ class ArraySerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class ArrayDeserializationCluster : public DeserializationCluster {
public:
explicit ArrayDeserializationCluster(intptr_t cid) : cid_(cid) {}
@@ -4331,7 +4243,6 @@ class ArrayDeserializationCluster : public DeserializationCluster {
const intptr_t cid_;
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class OneByteStringSerializationCluster : public SerializationCluster {
public:
@@ -4373,7 +4284,6 @@ class OneByteStringSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class OneByteStringDeserializationCluster : public DeserializationCluster {
public:
OneByteStringDeserializationCluster() {}
@@ -4410,7 +4320,6 @@ class OneByteStringDeserializationCluster : public DeserializationCluster {
}
};
-
#if !defined(DART_PRECOMPILED_RUNTIME)
class TwoByteStringSerializationCluster : public SerializationCluster {
public:
@@ -4452,7 +4361,6 @@ class TwoByteStringSerializationCluster : public SerializationCluster {
};
#endif // !DART_PRECOMPILED_RUNTIME
-
class TwoByteStringDeserializationCluster : public DeserializationCluster {
public:
TwoByteStringDeserializationCluster() {}
@@ -4488,7 +4396,6 @@ class TwoByteStringDeserializationCluster : public DeserializationCluster {
}
};
-
Serializer::Serializer(Thread* thread,
Snapshot::Kind kind,
uint8_t** buffer,
@@ -4520,12 +4427,10 @@ Serializer::Serializer(Thread* thread,
}
}
-
Serializer::~Serializer() {
delete[] clusters_by_cid_;
}
-
SerializationCluster* Serializer::NewClusterForClass(intptr_t cid) {
#if defined(DART_PRECOMPILED_RUNTIME)
UNREACHABLE();
@@ -4657,7 +4562,6 @@ SerializationCluster* Serializer::NewClusterForClass(intptr_t cid) {
#endif // !DART_PRECOMPILED_RUNTIME
}
-
void Serializer::Push(RawObject* object) {
if (!object->IsHeapObject()) {
RawSmi* smi = Smi::RawCast(object);
@@ -4696,7 +4600,6 @@ void Serializer::Push(RawObject* object) {
}
}
-
void Serializer::Trace(RawObject* object) {
intptr_t cid;
if (!object->IsHeapObject()) {
@@ -4725,7 +4628,6 @@ void Serializer::Trace(RawObject* object) {
#endif
}
-
void Serializer::UnexpectedObject(RawObject* raw_object, const char* message) {
Object& object = Object::Handle(raw_object);
OS::PrintErr("Unexpected object (%s): %s\n", message, object.ToCString());
@@ -4738,7 +4640,6 @@ void Serializer::UnexpectedObject(RawObject* raw_object, const char* message) {
OS::Abort();
}
-
#if defined(SNAPSHOT_BACKTRACE)
RawObject* Serializer::ParentOf(const Object& object) {
for (intptr_t i = 0; i < parent_pairs_.length(); i += 2) {
@@ -4750,7 +4651,6 @@ RawObject* Serializer::ParentOf(const Object& object) {
}
#endif // SNAPSHOT_BACKTRACE
-
void Serializer::WriteVersionAndFeatures() {
const char* expected_version = Version::SnapshotString();
ASSERT(expected_version != NULL);
@@ -4766,7 +4666,6 @@ void Serializer::WriteVersionAndFeatures() {
free(const_cast<char*>(expected_features));
}
-
#if defined(DEBUG)
static const int32_t kSectionMarker = 0xABAB;
#endif
@@ -4819,7 +4718,6 @@ void Serializer::Serialize() {
}
}
-
void Serializer::AddVMIsolateBaseObjects() {
// These objects are always allocated by Object::InitOnce, so they are not
// written into the snapshot.
@@ -4867,7 +4765,6 @@ void Serializer::AddVMIsolateBaseObjects() {
}
}
-
intptr_t Serializer::WriteVMSnapshot(const Array& symbols,
const Array& scripts) {
NoSafepointScope no_safepoint;
@@ -4906,7 +4803,6 @@ intptr_t Serializer::WriteVMSnapshot(const Array& symbols,
return next_ref_index_ - 1;
}
-
void Serializer::WriteIsolateSnapshot(intptr_t num_base_objects,
ObjectStore* object_store) {
NoSafepointScope no_safepoint;
@@ -4944,7 +4840,6 @@ void Serializer::WriteIsolateSnapshot(intptr_t num_base_objects,
heap_->ResetObjectIdTable();
}
-
Deserializer::Deserializer(Thread* thread,
Snapshot::Kind kind,
const uint8_t* buffer,
@@ -4967,12 +4862,10 @@ Deserializer::Deserializer(Thread* thread,
}
}
-
Deserializer::~Deserializer() {
delete[] clusters_;
}
-
DeserializationCluster* Deserializer::ReadCluster() {
intptr_t cid = ReadCid();
@@ -5096,7 +4989,6 @@ DeserializationCluster* Deserializer::ReadCluster() {
return NULL;
}
-
RawApiError* Deserializer::VerifyVersionAndFeatures(Isolate* isolate) {
// If the version string doesn't match, return an error.
// Note: New things are allocated only if we're going to return an error.
@@ -5163,7 +5055,6 @@ RawApiError* Deserializer::VerifyVersionAndFeatures(Isolate* isolate) {
return ApiError::null();
}
-
void Deserializer::Prepare() {
num_base_objects_ = Read<int32_t>();
num_objects_ = Read<int32_t>();
@@ -5173,7 +5064,6 @@ void Deserializer::Prepare() {
refs_ = Array::New(num_objects_ + 1, Heap::kOld);
}
-
void Deserializer::Deserialize() {
if (num_base_objects_ != (next_ref_index_ - 1)) {
FATAL2("Snapshot expects %" Pd
@@ -5222,7 +5112,6 @@ class HeapLocker : public StackResource {
PageSpace* page_space_;
};
-
void Deserializer::AddVMIsolateBaseObjects() {
// These objects are always allocated by Object::InitOnce, so they are not
// written into the snapshot.
@@ -5270,7 +5159,6 @@ void Deserializer::AddVMIsolateBaseObjects() {
}
}
-
void Deserializer::ReadVMSnapshot() {
Array& symbol_table = Array::Handle(zone_);
Array& refs = Array::Handle(zone_);
@@ -5368,7 +5256,6 @@ void Deserializer::ReadIsolateSnapshot(ObjectStore* object_store) {
Bootstrap::SetupNativeResolver();
}
-
// An object visitor which will iterate over all the token stream objects in the
// heap and either count them or collect them into an array. This is used during
// full snapshot generation of the VM isolate to write out all token streams so
@@ -5403,7 +5290,6 @@ class SnapshotTokenStreamVisitor : public ObjectVisitor {
const Array* token_streams_;
};
-
FullSnapshotWriter::FullSnapshotWriter(Snapshot::Kind kind,
uint8_t** vm_snapshot_data_buffer,
uint8_t** isolate_snapshot_data_buffer,
@@ -5492,7 +5378,6 @@ FullSnapshotWriter::~FullSnapshotWriter() {
token_streams_ = Array::null();
}
-
intptr_t FullSnapshotWriter::WriteVMSnapshot() {
NOT_IN_PRODUCT(TimelineDurationScope tds(
thread(), Timeline::GetIsolateStream(), "WriteVMSnapshot"));
@@ -5524,7 +5409,6 @@ intptr_t FullSnapshotWriter::WriteVMSnapshot() {
return num_objects;
}
-
void FullSnapshotWriter::WriteIsolateSnapshot(intptr_t num_base_objects) {
NOT_IN_PRODUCT(TimelineDurationScope tds(
thread(), Timeline::GetIsolateStream(), "WriteIsolateSnapshot"));
@@ -5553,7 +5437,6 @@ void FullSnapshotWriter::WriteIsolateSnapshot(intptr_t num_base_objects) {
isolate_snapshot_size_ = serializer.bytes_written();
}
-
void FullSnapshotWriter::WriteFullSnapshot() {
intptr_t num_base_objects;
if (vm_snapshot_data_buffer() != NULL) {
@@ -5576,7 +5459,6 @@ void FullSnapshotWriter::WriteFullSnapshot() {
}
}
-
static const uint8_t* DataBuffer(const Snapshot* snapshot) {
if (Snapshot::IncludesCode(snapshot->kind())) {
uword offset =
@@ -5586,7 +5468,6 @@ static const uint8_t* DataBuffer(const Snapshot* snapshot) {
return NULL;
}
-
FullSnapshotReader::FullSnapshotReader(const Snapshot* snapshot,
const uint8_t* instructions_buffer,
Thread* thread)
@@ -5599,7 +5480,6 @@ FullSnapshotReader::FullSnapshotReader(const Snapshot* snapshot,
thread->isolate()->set_compilation_allowed(kind_ != Snapshot::kFullAOT);
}
-
RawApiError* FullSnapshotReader::ReadVMSnapshot() {
Deserializer deserializer(thread_, kind_, buffer_, size_,
instructions_buffer_, data_buffer_);
@@ -5623,7 +5503,6 @@ RawApiError* FullSnapshotReader::ReadVMSnapshot() {
return ApiError::null();
}
-
RawApiError* FullSnapshotReader::ReadIsolateSnapshot() {
Deserializer deserializer(thread_, kind_, buffer_, size_,
instructions_buffer_, data_buffer_);
« no previous file with comments | « runtime/vm/clustered_snapshot.h ('k') | runtime/vm/code_descriptors.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698