Commit b90c98fc authored by Marja Hölttä's avatar Marja Hölttä Committed by Commit Bot

[objects.h splitting] Move SharedFunctionInfo.

BUG=v8:5402

Change-Id: If5f763e6a11d446e36719277a18b00a0cd8df8fa
Reviewed-on: https://chromium-review.googlesource.com/517162
Commit-Queue: Marja Hölttä <marja@chromium.org>
Reviewed-by: 's avatarMichael Starzinger <mstarzinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#45565}
parent 8f7af5fb
...@@ -710,6 +710,8 @@ action("postmortem-metadata") { ...@@ -710,6 +710,8 @@ action("postmortem-metadata") {
"src/objects-inl.h", "src/objects-inl.h",
"src/objects/map.h", "src/objects/map.h",
"src/objects/map-inl.h", "src/objects/map-inl.h",
"src/objects/shared-function-info.h",
"src/objects/shared-function-info-inl.h",
] ]
outputs = [ outputs = [
...@@ -1778,6 +1780,8 @@ v8_source_set("v8_base") { ...@@ -1778,6 +1780,8 @@ v8_source_set("v8_base") {
"src/objects/regexp-match-info.h", "src/objects/regexp-match-info.h",
"src/objects/scope-info.cc", "src/objects/scope-info.cc",
"src/objects/scope-info.h", "src/objects/scope-info.h",
"src/objects/shared-function-info-inl.h",
"src/objects/shared-function-info.h",
"src/objects/string-table.h", "src/objects/string-table.h",
"src/ostreams.cc", "src/ostreams.cc",
"src/ostreams.h", "src/ostreams.h",
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#define V8_BOOTSTRAPPER_H_ #define V8_BOOTSTRAPPER_H_
#include "src/factory.h" #include "src/factory.h"
#include "src/objects/shared-function-info.h"
#include "src/snapshot/natives.h" #include "src/snapshot/natives.h"
#include "src/visitors.h" #include "src/visitors.h"
......
...@@ -6,14 +6,12 @@ ...@@ -6,14 +6,12 @@
#define V8_COMPILER_FRAME_STATES_H_ #define V8_COMPILER_FRAME_STATES_H_
#include "src/handles.h" #include "src/handles.h"
#include "src/objects/shared-function-info.h"
#include "src/utils.h" #include "src/utils.h"
namespace v8 { namespace v8 {
namespace internal { namespace internal {
// Forward declarations.
class SharedFunctionInfo;
namespace compiler { namespace compiler {
// Flag that describes how to combine the current environment with // Flag that describes how to combine the current environment with
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include "src/compiler/pipeline-statistics.h" #include "src/compiler/pipeline-statistics.h"
#include "src/compiler/zone-stats.h" #include "src/compiler/zone-stats.h"
#include "src/isolate.h" #include "src/isolate.h"
#include "src/objects/shared-function-info.h"
namespace v8 { namespace v8 {
namespace internal { namespace internal {
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "src/objects/dictionary.h" #include "src/objects/dictionary.h"
#include "src/objects/map-inl.h" #include "src/objects/map-inl.h"
#include "src/objects/regexp-match-info.h" #include "src/objects/regexp-match-info.h"
#include "src/objects/shared-function-info-inl.h"
namespace v8 { namespace v8 {
namespace internal { namespace internal {
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include "src/factory.h" #include "src/factory.h"
#include "src/feedback-vector.h" #include "src/feedback-vector.h"
#include "src/globals.h" #include "src/globals.h"
#include "src/objects/shared-function-info.h"
namespace v8 { namespace v8 {
namespace internal { namespace internal {
......
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
#include "src/heap/scavenger-inl.h" #include "src/heap/scavenger-inl.h"
#include "src/heap/store-buffer.h" #include "src/heap/store-buffer.h"
#include "src/interpreter/interpreter.h" #include "src/interpreter/interpreter.h"
#include "src/objects/shared-function-info.h"
#include "src/regexp/jsregexp.h" #include "src/regexp/jsregexp.h"
#include "src/runtime-profiler.h" #include "src/runtime-profiler.h"
#include "src/snapshot/natives.h" #include "src/snapshot/natives.h"
...@@ -6492,6 +6493,9 @@ void Heap::RememberUnmappedPage(Address page, bool compacted) { ...@@ -6492,6 +6493,9 @@ void Heap::RememberUnmappedPage(Address page, bool compacted) {
remembered_unmapped_pages_index_ %= kRememberedUnmappedPages; remembered_unmapped_pages_index_ %= kRememberedUnmappedPages;
} }
void Heap::AgeInlineCaches() {
global_ic_age_ = (global_ic_age_ + 1) & SharedFunctionInfo::ICAgeBits::kMax;
}
void Heap::RegisterStrongRoots(Object** start, Object** end) { void Heap::RegisterStrongRoots(Object** start, Object** end) {
StrongRootsList* list = new StrongRootsList(); StrongRootsList* list = new StrongRootsList();
......
...@@ -897,9 +897,7 @@ class Heap { ...@@ -897,9 +897,7 @@ class Heap {
// disposal. We use it to flush inline caches. // disposal. We use it to flush inline caches.
int global_ic_age() { return global_ic_age_; } int global_ic_age() { return global_ic_age_; }
void AgeInlineCaches() { void AgeInlineCaches();
global_ic_age_ = (global_ic_age_ + 1) & SharedFunctionInfo::ICAgeBits::kMax;
}
int64_t external_memory_hard_limit() { return MaxOldGenerationSize() / 2; } int64_t external_memory_hard_limit() { return MaxOldGenerationSize() / 2; }
......
This diff is collapsed.
This diff is collapsed.
...@@ -57,3 +57,5 @@ ...@@ -57,3 +57,5 @@
#undef WRITE_BYTE_FIELD #undef WRITE_BYTE_FIELD
#undef NOBARRIER_WRITE_BYTE_FIELD #undef NOBARRIER_WRITE_BYTE_FIELD
#undef DECLARE_VERIFIER #undef DECLARE_VERIFIER
#undef DEFINE_DEOPT_ELEMENT_ACCESSORS
#undef DEFINE_DEOPT_ENTRY_ACCESSORS
...@@ -246,3 +246,19 @@ ...@@ -246,3 +246,19 @@
#else #else
#define DECLARE_VERIFIER(Name) #define DECLARE_VERIFIER(Name)
#endif #endif
#define DEFINE_DEOPT_ELEMENT_ACCESSORS(name, type) \
type* DeoptimizationInputData::name() { \
return type::cast(get(k##name##Index)); \
} \
void DeoptimizationInputData::Set##name(type* value) { \
set(k##name##Index, value); \
}
#define DEFINE_DEOPT_ENTRY_ACCESSORS(name, type) \
type* DeoptimizationInputData::name(int i) { \
return type::cast(get(IndexForEntry(i) + k##name##Offset)); \
} \
void DeoptimizationInputData::Set##name(int i, type* value) { \
set(IndexForEntry(i) + k##name##Offset, value); \
}
This diff is collapsed.
This diff is collapsed.
...@@ -1247,6 +1247,8 @@ ...@@ -1247,6 +1247,8 @@
'objects/regexp-match-info.h', 'objects/regexp-match-info.h',
'objects/scope-info.cc', 'objects/scope-info.cc',
'objects/scope-info.h', 'objects/scope-info.h',
'objects/shared-function-info-inl.h',
'objects/shared-function-info.h',
'objects/string-table.h', 'objects/string-table.h',
'ostreams.cc', 'ostreams.cc',
'ostreams.h', 'ostreams.h',
...@@ -2553,6 +2555,8 @@ ...@@ -2553,6 +2555,8 @@
'objects-inl.h', 'objects-inl.h',
'objects/map.h', 'objects/map.h',
'objects/map-inl.h', 'objects/map-inl.h',
'objects/shared-function-info.h',
'objects/shared-function-info-inl.h',
], ],
}, },
'actions': [ 'actions': [
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#define V8_TEST_FEEDBACK_VECTOR_H_ #define V8_TEST_FEEDBACK_VECTOR_H_
#include "src/objects.h" #include "src/objects.h"
#include "src/objects/shared-function-info.h"
namespace v8 { namespace v8 {
namespace internal { namespace internal {
......
...@@ -2,11 +2,13 @@ ...@@ -2,11 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "src/compiler/liveness-analyzer.h"
#include "src/compiler/js-graph.h" #include "src/compiler/js-graph.h"
#include "src/compiler/linkage.h" #include "src/compiler/linkage.h"
#include "src/compiler/liveness-analyzer.h"
#include "src/compiler/node-matchers.h" #include "src/compiler/node-matchers.h"
#include "src/compiler/state-values-utils.h" #include "src/compiler/state-values-utils.h"
#include "src/objects/shared-function-info.h"
#include "test/unittests/compiler/graph-unittest.h" #include "test/unittests/compiler/graph-unittest.h"
#include "test/unittests/compiler/node-test-utils.h" #include "test/unittests/compiler/node-test-utils.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment