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

Side by Side Diff: src/isolate.cc

Issue 10187003: Fix compile failure on Mac in r11417. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 8 years, 8 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 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 1839 matching lines...) Expand 10 before | Expand all | Expand 10 after
1850 runtime_profiler_->SetUp(); 1850 runtime_profiler_->SetUp();
1851 1851
1852 // If we are deserializing, log non-function code objects and compiled 1852 // If we are deserializing, log non-function code objects and compiled
1853 // functions found in the snapshot. 1853 // functions found in the snapshot.
1854 if (des != NULL && (FLAG_log_code || FLAG_ll_prof)) { 1854 if (des != NULL && (FLAG_log_code || FLAG_ll_prof)) {
1855 HandleScope scope; 1855 HandleScope scope;
1856 LOG(this, LogCodeObjects()); 1856 LOG(this, LogCodeObjects());
1857 LOG(this, LogCompiledFunctions()); 1857 LOG(this, LogCompiledFunctions());
1858 } 1858 }
1859 1859
1860 CHECK_EQ(OFFSET_OF(Isolate, state_), 1860 CHECK_EQ(static_cast<int>(OFFSET_OF(Isolate, state_)),
1861 static_cast<intptr_t>(Internals::kIsolateStateOffset)); 1861 Internals::kIsolateStateOffset);
1862 CHECK_EQ(OFFSET_OF(Isolate, embedder_data_), 1862 CHECK_EQ(static_cast<int>(OFFSET_OF(Isolate, embedder_data_)),
1863 static_cast<intptr_t>(Internals::kIsolateEmbedderDataOffset)); 1863 Internals::kIsolateEmbedderDataOffset);
1864 CHECK_EQ(OFFSET_OF(Isolate, heap_.roots_), 1864 CHECK_EQ(static_cast<int>(OFFSET_OF(Isolate, heap_.roots_)),
1865 static_cast<intptr_t>(Internals::kIsolateRootsOffset)); 1865 Internals::kIsolateRootsOffset);
1866 1866
1867 state_ = INITIALIZED; 1867 state_ = INITIALIZED;
1868 time_millis_at_init_ = OS::TimeCurrentMillis(); 1868 time_millis_at_init_ = OS::TimeCurrentMillis();
1869 return true; 1869 return true;
1870 } 1870 }
1871 1871
1872 1872
1873 // Initialized lazily to allow early 1873 // Initialized lazily to allow early
1874 // v8::V8::SetAddHistogramSampleFunction calls. 1874 // v8::V8::SetAddHistogramSampleFunction calls.
1875 StatsTable* Isolate::stats_table() { 1875 StatsTable* Isolate::stats_table() {
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
1951 1951
1952 #ifdef DEBUG 1952 #ifdef DEBUG
1953 #define ISOLATE_FIELD_OFFSET(type, name, ignored) \ 1953 #define ISOLATE_FIELD_OFFSET(type, name, ignored) \
1954 const intptr_t Isolate::name##_debug_offset_ = OFFSET_OF(Isolate, name##_); 1954 const intptr_t Isolate::name##_debug_offset_ = OFFSET_OF(Isolate, name##_);
1955 ISOLATE_INIT_LIST(ISOLATE_FIELD_OFFSET) 1955 ISOLATE_INIT_LIST(ISOLATE_FIELD_OFFSET)
1956 ISOLATE_INIT_ARRAY_LIST(ISOLATE_FIELD_OFFSET) 1956 ISOLATE_INIT_ARRAY_LIST(ISOLATE_FIELD_OFFSET)
1957 #undef ISOLATE_FIELD_OFFSET 1957 #undef ISOLATE_FIELD_OFFSET
1958 #endif 1958 #endif
1959 1959
1960 } } // namespace v8::internal 1960 } } // namespace v8::internal
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