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

Unified Diff: runtime/vm/raw_object.h

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/random.cc ('k') | runtime/vm/raw_object.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/raw_object.h
diff --git a/runtime/vm/raw_object.h b/runtime/vm/raw_object.h
index 36c61afd66dfdac2f1fb964679f44b89489c5a56..a6c240a4245bf315c5e194243fa69d32174219b8 100644
--- a/runtime/vm/raw_object.h
+++ b/runtime/vm/raw_object.h
@@ -140,14 +140,12 @@ namespace dart {
V(Object) \
CLASS_LIST_NO_OBJECT(V)
-
// Forward declarations.
class Isolate;
#define DEFINE_FORWARD_DECLARATION(clazz) class Raw##clazz;
CLASS_LIST(DEFINE_FORWARD_DECLARATION)
#undef DEFINE_FORWARD_DECLARATION
-
enum ClassId {
// Illegal class id.
kIllegalCid = 0,
@@ -694,7 +692,6 @@ class RawObject {
DISALLOW_IMPLICIT_CONSTRUCTORS(RawObject);
};
-
class RawClass : public RawObject {
public:
enum ClassFinalizedState {
@@ -768,7 +765,6 @@ class RawClass : public RawObject {
friend class CidRewriteVisitor;
};
-
class RawUnresolvedClass : public RawObject {
RAW_HEAP_OBJECT_IMPLEMENTATION(UnresolvedClass);
@@ -782,7 +778,6 @@ class RawUnresolvedClass : public RawObject {
TokenPosition token_pos_;
};
-
class RawTypeArguments : public RawObject {
private:
RAW_HEAP_OBJECT_IMPLEMENTATION(TypeArguments);
@@ -814,7 +809,6 @@ class RawTypeArguments : public RawObject {
friend class SnapshotReader;
};
-
class RawPatchClass : public RawObject {
private:
RAW_HEAP_OBJECT_IMPLEMENTATION(PatchClass);
@@ -830,7 +824,6 @@ class RawPatchClass : public RawObject {
friend class Function;
};
-
class RawFunction : public RawObject {
public:
enum Kind {
@@ -912,7 +905,6 @@ class RawFunction : public RawObject {
NOT_IN_PRECOMPILED(int8_t was_compiled_);
};
-
class RawClosureData : public RawObject {
private:
RAW_HEAP_OBJECT_IMPLEMENTATION(ClosureData);
@@ -933,7 +925,6 @@ class RawClosureData : public RawObject {
friend class Function;
};
-
class RawSignatureData : public RawObject {
private:
RAW_HEAP_OBJECT_IMPLEMENTATION(SignatureData);
@@ -950,7 +941,6 @@ class RawSignatureData : public RawObject {
friend class Function;
};
-
class RawRedirectionData : public RawObject {
private:
RAW_HEAP_OBJECT_IMPLEMENTATION(RedirectionData);
@@ -962,7 +952,6 @@ class RawRedirectionData : public RawObject {
RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->target_); }
};
-
class RawField : public RawObject {
RAW_HEAP_OBJECT_IMPLEMENTATION(Field);
@@ -1022,7 +1011,6 @@ class RawField : public RawObject {
friend class CidRewriteVisitor;
};
-
class RawLiteralToken : public RawObject {
RAW_HEAP_OBJECT_IMPLEMENTATION(LiteralToken);
@@ -1035,7 +1023,6 @@ class RawLiteralToken : public RawObject {
friend class SnapshotReader;
};
-
class RawTokenStream : public RawObject {
RAW_HEAP_OBJECT_IMPLEMENTATION(TokenStream);
@@ -1050,7 +1037,6 @@ class RawTokenStream : public RawObject {
friend class SnapshotReader;
};
-
class RawScript : public RawObject {
public:
enum Kind {
@@ -1104,7 +1090,6 @@ class RawScript : public RawObject {
intptr_t kernel_script_index_;
};
-
class RawLibrary : public RawObject {
enum LibraryState {
kAllocated, // Initial state.
@@ -1151,7 +1136,6 @@ class RawLibrary : public RawObject {
friend class Isolate;
};
-
class RawNamespace : public RawObject {
RAW_HEAP_OBJECT_IMPLEMENTATION(Namespace);
@@ -1166,7 +1150,6 @@ class RawNamespace : public RawObject {
}
};
-
class RawCode : public RawObject {
RAW_HEAP_OBJECT_IMPLEMENTATION(Code);
@@ -1233,7 +1216,6 @@ class RawCode : public RawObject {
friend class FunctionDeserializationCluster;
};
-
class RawObjectPool : public RawObject {
RAW_HEAP_OBJECT_IMPLEMENTATION(ObjectPool);
@@ -1254,7 +1236,6 @@ class RawObjectPool : public RawObject {
friend class Object;
};
-
class RawInstructions : public RawObject {
RAW_HEAP_OBJECT_IMPLEMENTATION(Instructions);
@@ -1282,7 +1263,6 @@ class RawInstructions : public RawObject {
friend class ImageWriter;
};
-
class RawPcDescriptors : public RawObject {
public:
enum Kind {
@@ -1343,7 +1323,6 @@ class RawPcDescriptors : public RawObject {
friend class Object;
};
-
// CodeSourceMap encodes a mapping from code PC ranges to source token
// positions and the stack of inlined functions.
class RawCodeSourceMap : public RawObject {
@@ -1361,7 +1340,6 @@ class RawCodeSourceMap : public RawObject {
friend class Object;
};
-
// StackMap is an immutable representation of the layout of the stack at a
// PC. The stack map representation consists of a bit map which marks each
// live object index starting from the base of the frame.
@@ -1388,7 +1366,6 @@ class RawStackMap : public RawObject {
const uint8_t* data() const { OPEN_ARRAY_START(uint8_t, uint8_t); }
};
-
class RawLocalVarDescriptors : public RawObject {
public:
enum VarInfoKind {
@@ -1461,7 +1438,6 @@ class RawLocalVarDescriptors : public RawObject {
friend class Object;
};
-
class RawExceptionHandlers : public RawObject {
private:
RAW_HEAP_OBJECT_IMPLEMENTATION(ExceptionHandlers);
@@ -1484,7 +1460,6 @@ class RawExceptionHandlers : public RawObject {
friend class Object;
};
-
class RawContext : public RawObject {
RAW_HEAP_OBJECT_IMPLEMENTATION(Context);
@@ -1504,7 +1479,6 @@ class RawContext : public RawObject {
friend class SnapshotReader;
};
-
class RawContextScope : public RawObject {
RAW_HEAP_OBJECT_IMPLEMENTATION(ContextScope);
@@ -1549,7 +1523,6 @@ class RawContextScope : public RawObject {
friend class SnapshotReader;
};
-
class RawSingleTargetCache : public RawObject {
RAW_HEAP_OBJECT_IMPLEMENTATION(SingleTargetCache);
RawObject** from() { return reinterpret_cast<RawObject**>(&ptr()->target_); }
@@ -1560,7 +1533,6 @@ class RawSingleTargetCache : public RawObject {
classid_t upper_limit_;
};
-
class RawUnlinkedCall : public RawObject {
RAW_HEAP_OBJECT_IMPLEMENTATION(UnlinkedCall);
RawObject** from() {
@@ -1573,7 +1545,6 @@ class RawUnlinkedCall : public RawObject {
}
};
-
class RawICData : public RawObject {
RAW_HEAP_OBJECT_IMPLEMENTATION(ICData);
@@ -1607,7 +1578,6 @@ class RawICData : public RawObject {
#endif
};
-
class RawMegamorphicCache : public RawObject {
RAW_HEAP_OBJECT_IMPLEMENTATION(MegamorphicCache);
@@ -1623,18 +1593,15 @@ class RawMegamorphicCache : public RawObject {
int32_t filled_entry_count_;
};
-
class RawSubtypeTestCache : public RawObject {
RAW_HEAP_OBJECT_IMPLEMENTATION(SubtypeTestCache);
RawArray* cache_;
};
-
class RawError : public RawObject {
RAW_HEAP_OBJECT_IMPLEMENTATION(Error);
};
-
class RawApiError : public RawError {
RAW_HEAP_OBJECT_IMPLEMENTATION(ApiError);
@@ -1643,7 +1610,6 @@ class RawApiError : public RawError {
RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->message_); }
};
-
class RawLanguageError : public RawError {
RAW_HEAP_OBJECT_IMPLEMENTATION(LanguageError);
@@ -1662,7 +1628,6 @@ class RawLanguageError : public RawError {
int8_t kind_; // Of type Report::Kind.
};
-
class RawUnhandledException : public RawError {
RAW_HEAP_OBJECT_IMPLEMENTATION(UnhandledException);
@@ -1676,7 +1641,6 @@ class RawUnhandledException : public RawError {
}
};
-
class RawUnwindError : public RawError {
RAW_HEAP_OBJECT_IMPLEMENTATION(UnwindError);
@@ -1686,12 +1650,10 @@ class RawUnwindError : public RawError {
bool is_user_initiated_;
};
-
class RawInstance : public RawObject {
RAW_HEAP_OBJECT_IMPLEMENTATION(Instance);
};
-
class RawLibraryPrefix : public RawInstance {
RAW_HEAP_OBJECT_IMPLEMENTATION(LibraryPrefix);
@@ -1725,7 +1687,6 @@ class RawLibraryPrefix : public RawInstance {
bool is_loaded_;
};
-
class RawAbstractType : public RawInstance {
protected:
enum TypeState {
@@ -1742,7 +1703,6 @@ class RawAbstractType : public RawInstance {
friend class ObjectStore;
};
-
class RawType : public RawAbstractType {
private:
RAW_HEAP_OBJECT_IMPLEMENTATION(Type);
@@ -1774,7 +1734,6 @@ class RawType : public RawAbstractType {
friend class RawTypeArguments;
};
-
class RawTypeRef : public RawAbstractType {
private:
RAW_HEAP_OBJECT_IMPLEMENTATION(TypeRef);
@@ -1784,7 +1743,6 @@ class RawTypeRef : public RawAbstractType {
RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->type_); }
};
-
class RawTypeParameter : public RawAbstractType {
private:
RAW_HEAP_OBJECT_IMPLEMENTATION(TypeParameter);
@@ -1805,7 +1763,6 @@ class RawTypeParameter : public RawAbstractType {
friend class CidRewriteVisitor;
};
-
class RawBoundedType : public RawAbstractType {
private:
RAW_HEAP_OBJECT_IMPLEMENTATION(BoundedType);
@@ -1820,7 +1777,6 @@ class RawBoundedType : public RawAbstractType {
}
};
-
class RawMixinAppType : public RawAbstractType {
private:
RAW_HEAP_OBJECT_IMPLEMENTATION(MixinAppType);
@@ -1835,7 +1791,6 @@ class RawMixinAppType : public RawAbstractType {
}
};
-
class RawClosure : public RawInstance {
private:
RAW_HEAP_OBJECT_IMPLEMENTATION(Closure);
@@ -1866,22 +1821,18 @@ class RawClosure : public RawInstance {
// arguments of the parent that are found in the context_.
};
-
class RawNumber : public RawInstance {
RAW_OBJECT_IMPLEMENTATION(Number);
};
-
class RawInteger : public RawNumber {
RAW_OBJECT_IMPLEMENTATION(Integer);
};
-
class RawSmi : public RawInteger {
RAW_OBJECT_IMPLEMENTATION(Smi);
};
-
class RawMint : public RawInteger {
RAW_HEAP_OBJECT_IMPLEMENTATION(Mint);
@@ -1892,7 +1843,6 @@ class RawMint : public RawInteger {
};
COMPILE_ASSERT(sizeof(RawMint) == 16);
-
class RawBigint : public RawInteger {
RAW_HEAP_OBJECT_IMPLEMENTATION(Bigint);
@@ -1903,7 +1853,6 @@ class RawBigint : public RawInteger {
RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->digits_); }
};
-
class RawDouble : public RawNumber {
RAW_HEAP_OBJECT_IMPLEMENTATION(Double);
@@ -1914,7 +1863,6 @@ class RawDouble : public RawNumber {
};
COMPILE_ASSERT(sizeof(RawDouble) == 16);
-
class RawString : public RawInstance {
RAW_HEAP_OBJECT_IMPLEMENTATION(String);
@@ -1937,7 +1885,6 @@ class RawString : public RawInstance {
friend class RODataSerializationCluster;
};
-
class RawOneByteString : public RawString {
RAW_HEAP_OBJECT_IMPLEMENTATION(OneByteString);
@@ -1951,7 +1898,6 @@ class RawOneByteString : public RawString {
friend class String;
};
-
class RawTwoByteString : public RawString {
RAW_HEAP_OBJECT_IMPLEMENTATION(TwoByteString);
@@ -1964,7 +1910,6 @@ class RawTwoByteString : public RawString {
friend class String;
};
-
template <typename T>
class ExternalStringData {
public:
@@ -1987,7 +1932,6 @@ class ExternalStringData {
Dart_PeerFinalizer callback_;
};
-
class RawExternalOneByteString : public RawString {
RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalOneByteString);
@@ -2000,7 +1944,6 @@ class RawExternalOneByteString : public RawString {
friend class String;
};
-
class RawExternalTwoByteString : public RawString {
RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalTwoByteString);
@@ -2013,14 +1956,12 @@ class RawExternalTwoByteString : public RawString {
friend class String;
};
-
class RawBool : public RawInstance {
RAW_HEAP_OBJECT_IMPLEMENTATION(Bool);
bool value_;
};
-
class RawArray : public RawInstance {
RAW_HEAP_OBJECT_IMPLEMENTATION(Array);
@@ -2050,14 +1991,12 @@ class RawArray : public RawInstance {
friend class SubtypeTestCache; // For high performance access.
};
-
class RawImmutableArray : public RawArray {
RAW_HEAP_OBJECT_IMPLEMENTATION(ImmutableArray);
friend class SnapshotReader;
};
-
class RawGrowableObjectArray : public RawInstance {
RAW_HEAP_OBJECT_IMPLEMENTATION(GrowableObjectArray);
@@ -2072,7 +2011,6 @@ class RawGrowableObjectArray : public RawInstance {
friend class SnapshotReader;
};
-
class RawLinkedHashMap : public RawInstance {
RAW_HEAP_OBJECT_IMPLEMENTATION(LinkedHashMap);
@@ -2092,7 +2030,6 @@ class RawLinkedHashMap : public RawInstance {
friend class SnapshotReader;
};
-
class RawFloat32x4 : public RawInstance {
RAW_HEAP_OBJECT_IMPLEMENTATION(Float32x4);
@@ -2108,7 +2045,6 @@ class RawFloat32x4 : public RawInstance {
};
COMPILE_ASSERT(sizeof(RawFloat32x4) == 24);
-
class RawInt32x4 : public RawInstance {
RAW_HEAP_OBJECT_IMPLEMENTATION(Int32x4);
@@ -2124,7 +2060,6 @@ class RawInt32x4 : public RawInstance {
};
COMPILE_ASSERT(sizeof(RawInt32x4) == 24);
-
class RawFloat64x2 : public RawInstance {
RAW_HEAP_OBJECT_IMPLEMENTATION(Float64x2);
@@ -2138,7 +2073,6 @@ class RawFloat64x2 : public RawInstance {
};
COMPILE_ASSERT(sizeof(RawFloat64x2) == 24);
-
// Define an aliases for intptr_t.
#if defined(ARCH_IS_32_BIT)
#define kIntPtrCid kTypedDataInt32ArrayCid
@@ -2150,7 +2084,6 @@ COMPILE_ASSERT(sizeof(RawFloat64x2) == 24);
#error Architecture is not 32-bit or 64-bit.
#endif // ARCH_IS_32_BIT
-
class RawTypedData : public RawInstance {
RAW_HEAP_OBJECT_IMPLEMENTATION(TypedData);
@@ -2172,7 +2105,6 @@ class RawTypedData : public RawInstance {
friend class ObjectPoolDeserializationCluster;
};
-
class RawExternalTypedData : public RawInstance {
RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalTypedData);
@@ -2193,7 +2125,6 @@ class RawCapability : public RawInstance {
uint64_t id_;
};
-
class RawSendPort : public RawInstance {
RAW_HEAP_OBJECT_IMPLEMENTATION(SendPort);
Dart_Port id_;
@@ -2202,7 +2133,6 @@ class RawSendPort : public RawInstance {
friend class ReceivePort;
};
-
class RawReceivePort : public RawInstance {
RAW_HEAP_OBJECT_IMPLEMENTATION(ReceivePort);
@@ -2214,7 +2144,6 @@ class RawReceivePort : public RawInstance {
RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->handler_); }
};
-
// VM type for capturing stacktraces when exceptions are thrown,
// Currently we don't have any interface that this object is supposed
// to implement so we just support the 'toString' method which
@@ -2235,7 +2164,6 @@ class RawStackTrace : public RawInstance {
bool expand_inlined_;
};
-
// VM type for capturing JS regular expressions.
class RawRegExp : public RawInstance {
RAW_HEAP_OBJECT_IMPLEMENTATION(RegExp);
@@ -2278,7 +2206,6 @@ class RawRegExp : public RawInstance {
int8_t type_flags_;
};
-
class RawWeakProperty : public RawInstance {
RAW_HEAP_OBJECT_IMPLEMENTATION(WeakProperty);
@@ -2310,7 +2237,6 @@ class RawMirrorReference : public RawInstance {
RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->referent_); }
};
-
// UserTag are used by the profiler to track Dart script state.
class RawUserTag : public RawInstance {
RAW_HEAP_OBJECT_IMPLEMENTATION(UserTag);
@@ -2342,7 +2268,6 @@ inline bool RawObject::IsErrorClassId(intptr_t index) {
return (index >= kErrorCid && index < kInstanceCid);
}
-
inline bool RawObject::IsNumberClassId(intptr_t index) {
// Make sure this function is updated when new Number types are added.
COMPILE_ASSERT(kIntegerCid == kNumberCid + 1 && kSmiCid == kNumberCid + 2 &&
@@ -2351,7 +2276,6 @@ inline bool RawObject::IsNumberClassId(intptr_t index) {
return (index >= kNumberCid && index < kBoolCid);
}
-
inline bool RawObject::IsIntegerClassId(intptr_t index) {
// Make sure this function is updated when new Integer types are added.
COMPILE_ASSERT(kSmiCid == kIntegerCid + 1 && kMintCid == kIntegerCid + 2 &&
@@ -2360,7 +2284,6 @@ inline bool RawObject::IsIntegerClassId(intptr_t index) {
return (index >= kIntegerCid && index < kDoubleCid);
}
-
inline bool RawObject::IsStringClassId(intptr_t index) {
// Make sure this function is updated when new StringCid types are added.
COMPILE_ASSERT(kOneByteStringCid == kStringCid + 1 &&
@@ -2370,7 +2293,6 @@ inline bool RawObject::IsStringClassId(intptr_t index) {
return (index >= kStringCid && index <= kExternalTwoByteStringCid);
}
-
inline bool RawObject::IsOneByteStringClassId(intptr_t index) {
// Make sure this function is updated when new StringCid types are added.
COMPILE_ASSERT(kOneByteStringCid == kStringCid + 1 &&
@@ -2380,7 +2302,6 @@ inline bool RawObject::IsOneByteStringClassId(intptr_t index) {
return (index == kOneByteStringCid || index == kExternalOneByteStringCid);
}
-
inline bool RawObject::IsTwoByteStringClassId(intptr_t index) {
// Make sure this function is updated when new StringCid types are added.
COMPILE_ASSERT(kOneByteStringCid == kStringCid + 1 &&
@@ -2390,7 +2311,6 @@ inline bool RawObject::IsTwoByteStringClassId(intptr_t index) {
return (index == kTwoByteStringCid || index == kExternalTwoByteStringCid);
}
-
inline bool RawObject::IsExternalStringClassId(intptr_t index) {
// Make sure this function is updated when new StringCid types are added.
COMPILE_ASSERT(kOneByteStringCid == kStringCid + 1 &&
@@ -2401,7 +2321,6 @@ inline bool RawObject::IsExternalStringClassId(intptr_t index) {
index == kExternalTwoByteStringCid);
}
-
inline bool RawObject::IsBuiltinListClassId(intptr_t index) {
// Make sure this function is updated when new builtin List types are added.
COMPILE_ASSERT(kImmutableArrayCid == kArrayCid + 1);
@@ -2411,7 +2330,6 @@ inline bool RawObject::IsBuiltinListClassId(intptr_t index) {
(index == kByteBufferCid));
}
-
inline bool RawObject::IsTypedDataClassId(intptr_t index) {
// Make sure this is updated when new TypedData types are added.
COMPILE_ASSERT(kTypedDataUint8ArrayCid == kTypedDataInt8ArrayCid + 1 &&
@@ -2432,7 +2350,6 @@ inline bool RawObject::IsTypedDataClassId(intptr_t index) {
index <= kTypedDataFloat64x2ArrayCid);
}
-
inline bool RawObject::IsTypedDataViewClassId(intptr_t index) {
// Make sure this is updated when new TypedData types are added.
COMPILE_ASSERT(
@@ -2454,7 +2371,6 @@ inline bool RawObject::IsTypedDataViewClassId(intptr_t index) {
return (index >= kTypedDataInt8ArrayViewCid && index <= kByteDataViewCid);
}
-
inline bool RawObject::IsExternalTypedDataClassId(intptr_t index) {
// Make sure this is updated when new ExternalTypedData types are added.
COMPILE_ASSERT(
@@ -2485,13 +2401,11 @@ inline bool RawObject::IsExternalTypedDataClassId(intptr_t index) {
index <= kExternalTypedDataFloat64x2ArrayCid);
}
-
inline bool RawObject::IsInternalVMdefinedClassId(intptr_t index) {
return ((index < kNumPredefinedCids) &&
!RawObject::IsImplicitFieldClassId(index));
}
-
inline bool RawObject::IsVariableSizeClassId(intptr_t index) {
return (index == kArrayCid) || (index == kImmutableArrayCid) ||
RawObject::IsOneByteStringClassId(index) ||
@@ -2506,7 +2420,6 @@ inline bool RawObject::IsVariableSizeClassId(intptr_t index) {
(index == kRegExpCid);
}
-
// This is a set of classes that are not Dart classes whose representation
// is defined by the VM but are used in the VM code by computing the
// implicit field offsets of the various fields in the dart object.
@@ -2514,7 +2427,6 @@ inline bool RawObject::IsImplicitFieldClassId(intptr_t index) {
return (IsTypedDataViewClassId(index) || index == kByteBufferCid);
}
-
inline intptr_t RawObject::NumberOfTypedDataClasses() {
// Make sure this is updated when new TypedData types are added.
COMPILE_ASSERT(kTypedDataInt8ArrayViewCid == kTypedDataInt8ArrayCid + 14);
@@ -2525,7 +2437,6 @@ inline intptr_t RawObject::NumberOfTypedDataClasses() {
return (kNullCid - kTypedDataInt8ArrayCid);
}
-
} // namespace dart
#endif // RUNTIME_VM_RAW_OBJECT_H_
« no previous file with comments | « runtime/vm/random.cc ('k') | runtime/vm/raw_object.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698