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

Side by Side Diff: src/serialize.h

Issue 656793005: Fix compile errors in r24826. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 2 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef V8_SERIALIZE_H_ 5 #ifndef V8_SERIALIZE_H_
6 #define V8_SERIALIZE_H_ 6 #define V8_SERIALIZE_H_
7 7
8 #include "src/compiler.h" 8 #include "src/compiler.h"
9 #include "src/hashmap.h" 9 #include "src/hashmap.h"
10 #include "src/heap-profiler.h" 10 #include "src/heap-profiler.h"
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 }; 139 };
140 140
141 141
142 class AddressMapBase { 142 class AddressMapBase {
143 protected: 143 protected:
144 static void SetValue(HashMap::Entry* entry, uint32_t v) { 144 static void SetValue(HashMap::Entry* entry, uint32_t v) {
145 entry->value = reinterpret_cast<void*>(v); 145 entry->value = reinterpret_cast<void*>(v);
146 } 146 }
147 147
148 static uint32_t GetValue(HashMap::Entry* entry) { 148 static uint32_t GetValue(HashMap::Entry* entry) {
149 return reinterpret_cast<uint32_t>(entry->value); 149 return static_cast<uint32_t>(reinterpret_cast<intptr_t>(entry->value));
Benedikt Meurer 2014/10/23 08:58:08 Why not just return reinterpret_cast<uintptr_t>
150 } 150 }
151 151
152 static HashMap::Entry* LookupEntry(HashMap* map, HeapObject* obj, 152 static HashMap::Entry* LookupEntry(HashMap* map, HeapObject* obj,
153 bool insert) { 153 bool insert) {
154 return map->Lookup(Key(obj), Hash(obj), insert); 154 return map->Lookup(Key(obj), Hash(obj), insert);
155 } 155 }
156 156
157 private: 157 private:
158 static uint32_t Hash(HeapObject* obj) { 158 static uint32_t Hash(HeapObject* obj) {
159 return static_cast<int32_t>(reinterpret_cast<intptr_t>(obj->address())); 159 return static_cast<int32_t>(reinterpret_cast<intptr_t>(obj->address()));
(...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after
827 // Following the header, we store, in sequential order 827 // Following the header, we store, in sequential order
828 // - code stub keys 828 // - code stub keys
829 // - serialization payload 829 // - serialization payload
830 830
831 ScriptData* script_data_; 831 ScriptData* script_data_;
832 bool owns_script_data_; 832 bool owns_script_data_;
833 }; 833 };
834 } } // namespace v8::internal 834 } } // namespace v8::internal
835 835
836 #endif // V8_SERIALIZE_H_ 836 #endif // V8_SERIALIZE_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698