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

Side by Side Diff: runtime/vm/raw_object.h

Issue 11342028: Fix wrong canonicalization of signature class due to name collision (issue 6353). (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « runtime/vm/object.cc ('k') | tests/language/closure8_test.dart » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #ifndef VM_RAW_OBJECT_H_ 5 #ifndef VM_RAW_OBJECT_H_
6 #define VM_RAW_OBJECT_H_ 6 #define VM_RAW_OBJECT_H_
7 7
8 #include "platform/assert.h" 8 #include "platform/assert.h"
9 #include "vm/globals.h" 9 #include "vm/globals.h"
10 #include "vm/token.h" 10 #include "vm/token.h"
(...skipping 1013 matching lines...) Expand 10 before | Expand all | Expand 10 after
1024 1024
1025 class RawTypeParameter : public RawAbstractType { 1025 class RawTypeParameter : public RawAbstractType {
1026 private: 1026 private:
1027 RAW_HEAP_OBJECT_IMPLEMENTATION(TypeParameter); 1027 RAW_HEAP_OBJECT_IMPLEMENTATION(TypeParameter);
1028 1028
1029 RawObject** from() { 1029 RawObject** from() {
1030 return reinterpret_cast<RawObject**>(&ptr()->parameterized_class_); 1030 return reinterpret_cast<RawObject**>(&ptr()->parameterized_class_);
1031 } 1031 }
1032 RawClass* parameterized_class_; 1032 RawClass* parameterized_class_;
1033 RawString* name_; 1033 RawString* name_;
1034 RawAbstractType* bound_; // DynamicType if no explicit bound specified. 1034 RawAbstractType* bound_; // ObjectType if no explicit bound specified.
1035 RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->bound_); } 1035 RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->bound_); }
1036 intptr_t index_; 1036 intptr_t index_;
1037 intptr_t token_pos_; 1037 intptr_t token_pos_;
1038 int8_t type_state_; 1038 int8_t type_state_;
1039 }; 1039 };
1040 1040
1041 1041
1042 class RawNumber : public RawInstance { 1042 class RawNumber : public RawInstance {
1043 RAW_OBJECT_IMPLEMENTATION(Number); 1043 RAW_OBJECT_IMPLEMENTATION(Number);
1044 }; 1044 };
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
1607 kExternalUint64ArrayCid == kByteArrayCid + 18 && 1607 kExternalUint64ArrayCid == kByteArrayCid + 18 &&
1608 kExternalFloat32ArrayCid == kByteArrayCid + 19 && 1608 kExternalFloat32ArrayCid == kByteArrayCid + 19 &&
1609 kExternalFloat64ArrayCid == kByteArrayCid + 20 && 1609 kExternalFloat64ArrayCid == kByteArrayCid + 20 &&
1610 kStacktraceCid == kByteArrayCid + 21); 1610 kStacktraceCid == kByteArrayCid + 21);
1611 return (index >= kByteArrayCid && index <= kExternalFloat64ArrayCid); 1611 return (index >= kByteArrayCid && index <= kExternalFloat64ArrayCid);
1612 } 1612 }
1613 1613
1614 } // namespace dart 1614 } // namespace dart
1615 1615
1616 #endif // VM_RAW_OBJECT_H_ 1616 #endif // VM_RAW_OBJECT_H_
OLDNEW
« no previous file with comments | « runtime/vm/object.cc ('k') | tests/language/closure8_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698