Commit 338ab857 authored by erik.corry@gmail.com's avatar erik.corry@gmail.com

Remove a static initializer that could potentially slow down startup time.

BUG=1753
Review URL: http://codereview.chromium.org/8198005

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@9551 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent cd6a982b
...@@ -4723,7 +4723,6 @@ bool OutSet::Get(unsigned value) { ...@@ -4723,7 +4723,6 @@ bool OutSet::Get(unsigned value) {
const uc16 DispatchTable::Config::kNoKey = unibrow::Utf8::kBadChar; const uc16 DispatchTable::Config::kNoKey = unibrow::Utf8::kBadChar;
const DispatchTable::Entry DispatchTable::Config::kNoValue;
void DispatchTable::AddRange(CharacterRange full_range, int value) { void DispatchTable::AddRange(CharacterRange full_range, int value) {
......
...@@ -389,7 +389,7 @@ class DispatchTable : public ZoneObject { ...@@ -389,7 +389,7 @@ class DispatchTable : public ZoneObject {
typedef uc16 Key; typedef uc16 Key;
typedef Entry Value; typedef Entry Value;
static const uc16 kNoKey; static const uc16 kNoKey;
static const Entry kNoValue; static const Entry NoValue() { return Value(); }
static inline int Compare(uc16 a, uc16 b) { static inline int Compare(uc16 a, uc16 b) {
if (a == b) if (a == b)
return 0; return 0;
......
...@@ -488,8 +488,6 @@ void CpuProfile::Print() { ...@@ -488,8 +488,6 @@ void CpuProfile::Print() {
CodeEntry* const CodeMap::kSharedFunctionCodeEntry = NULL; CodeEntry* const CodeMap::kSharedFunctionCodeEntry = NULL;
const CodeMap::CodeTreeConfig::Key CodeMap::CodeTreeConfig::kNoKey = NULL; const CodeMap::CodeTreeConfig::Key CodeMap::CodeTreeConfig::kNoKey = NULL;
const CodeMap::CodeTreeConfig::Value CodeMap::CodeTreeConfig::kNoValue =
CodeMap::CodeEntryInfo(NULL, 0);
void CodeMap::AddCode(Address addr, CodeEntry* entry, unsigned size) { void CodeMap::AddCode(Address addr, CodeEntry* entry, unsigned size) {
......
...@@ -257,7 +257,7 @@ class CodeMap { ...@@ -257,7 +257,7 @@ class CodeMap {
typedef Address Key; typedef Address Key;
typedef CodeEntryInfo Value; typedef CodeEntryInfo Value;
static const Key kNoKey; static const Key kNoKey;
static const Value kNoValue; static const Value NoValue() { return CodeEntryInfo(NULL, 0); }
static int Compare(const Key& a, const Key& b) { static int Compare(const Key& a, const Key& b) {
return a < b ? -1 : (a > b ? 1 : 0); return a < b ? -1 : (a > b ? 1 : 0);
} }
......
...@@ -45,7 +45,7 @@ template<typename Config, class Allocator> ...@@ -45,7 +45,7 @@ template<typename Config, class Allocator>
bool SplayTree<Config, Allocator>::Insert(const Key& key, Locator* locator) { bool SplayTree<Config, Allocator>::Insert(const Key& key, Locator* locator) {
if (is_empty()) { if (is_empty()) {
// If the tree is empty, insert the new node. // If the tree is empty, insert the new node.
root_ = new Node(key, Config::kNoValue); root_ = new Node(key, Config::NoValue());
} else { } else {
// Splay on the key to move the last node on the search path // Splay on the key to move the last node on the search path
// for the key to the root of the tree. // for the key to the root of the tree.
...@@ -57,7 +57,7 @@ bool SplayTree<Config, Allocator>::Insert(const Key& key, Locator* locator) { ...@@ -57,7 +57,7 @@ bool SplayTree<Config, Allocator>::Insert(const Key& key, Locator* locator) {
return false; return false;
} }
// Insert the new node. // Insert the new node.
Node* node = new Node(key, Config::kNoValue); Node* node = new Node(key, Config::NoValue());
InsertInternal(cmp, node); InsertInternal(cmp, node);
} }
locator->bind(root_); locator->bind(root_);
...@@ -226,7 +226,7 @@ template<typename Config, class Allocator> ...@@ -226,7 +226,7 @@ template<typename Config, class Allocator>
void SplayTree<Config, Allocator>::Splay(const Key& key) { void SplayTree<Config, Allocator>::Splay(const Key& key) {
if (is_empty()) if (is_empty())
return; return;
Node dummy_node(Config::kNoKey, Config::kNoValue); Node dummy_node(Config::kNoKey, Config::NoValue());
// Create a dummy node. The use of the dummy node is a bit // Create a dummy node. The use of the dummy node is a bit
// counter-intuitive: The right child of the dummy node will hold // counter-intuitive: The right child of the dummy node will hold
// the L tree of the algorithm. The left child of the dummy node // the L tree of the algorithm. The left child of the dummy node
......
...@@ -530,7 +530,7 @@ class TestConfig { ...@@ -530,7 +530,7 @@ class TestConfig {
typedef int Key; typedef int Key;
typedef int Value; typedef int Value;
static const int kNoKey; static const int kNoKey;
static const int kNoValue; static int NoValue() { return 0; }
static inline int Compare(int a, int b) { static inline int Compare(int a, int b) {
if (a < b) if (a < b)
return -1; return -1;
...@@ -543,7 +543,6 @@ class TestConfig { ...@@ -543,7 +543,6 @@ class TestConfig {
const int TestConfig::kNoKey = 0; const int TestConfig::kNoKey = 0;
const int TestConfig::kNoValue = 0;
static unsigned PseudoRandom(int i, int j) { static unsigned PseudoRandom(int i, int j) {
......
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