From ca5dad94a77427d6ae4514f4a7166e67a1cafe2f Mon Sep 17 00:00:00 2001 From: "svenpanne@chromium.org" Date: Fri, 13 May 2011 08:21:50 +0000 Subject: [PATCH] Removed dead code (ingenious 3-bit representation of types) Review URL: http://codereview.chromium.org/6973053 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@7883 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/type-info.h | 26 ---------------- test/cctest/SConscript | 1 - test/cctest/cctest.gyp | 1 - test/cctest/test-type-info.cc | 56 ----------------------------------- 4 files changed, 84 deletions(-) delete mode 100644 test/cctest/test-type-info.cc diff --git a/src/type-info.h b/src/type-info.h index 53d30703d6..5ca3c150f7 100644 --- a/src/type-info.h +++ b/src/type-info.h @@ -72,32 +72,6 @@ class TypeInfo { // We haven't started collecting info yet. static TypeInfo Uninitialized() { return TypeInfo(kUninitialized); } - // Return compact representation. Very sensitive to enum values below! - // Compacting drops information about primitive types and strings types. - // We use the compact representation when we only care about number types. - int ThreeBitRepresentation() { - ASSERT(type_ != kUninitialized); - int answer = type_ & 0xf; - answer = answer > 6 ? answer - 2 : answer; - ASSERT(answer >= 0); - ASSERT(answer <= 7); - return answer; - } - - // Decode compact representation. Very sensitive to enum values below! - static TypeInfo ExpandedRepresentation(int three_bit_representation) { - Type t = static_cast(three_bit_representation > 4 ? - three_bit_representation + 2 : - three_bit_representation); - t = (t == kUnknown) ? t : static_cast(t | kPrimitive); - ASSERT(t == kUnknown || - t == kNumber || - t == kInteger32 || - t == kSmi || - t == kDouble); - return TypeInfo(t); - } - int ToInt() { return type_; } diff --git a/test/cctest/SConscript b/test/cctest/SConscript index 559f807997..0197178cf2 100644 --- a/test/cctest/SConscript +++ b/test/cctest/SConscript @@ -80,7 +80,6 @@ SOURCES = { 'test-strtod.cc', 'test-thread-termination.cc', 'test-threads.cc', - 'test-type-info.cc', 'test-unbound-queue.cc', 'test-utils.cc', 'test-version.cc' diff --git a/test/cctest/cctest.gyp b/test/cctest/cctest.gyp index 2b9fbe9f35..f13f91e0e6 100644 --- a/test/cctest/cctest.gyp +++ b/test/cctest/cctest.gyp @@ -113,7 +113,6 @@ 'test-strtod.cc', 'test-thread-termination.cc', 'test-threads.cc', - 'test-type-info.cc', 'test-unbound-queue.cc', 'test-utils.cc', 'test-version.cc' diff --git a/test/cctest/test-type-info.cc b/test/cctest/test-type-info.cc deleted file mode 100644 index 59dd83d1f7..0000000000 --- a/test/cctest/test-type-info.cc +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright 2010 the V8 project authors. All rights reserved. -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -#include "cctest.h" -#include "type-info.h" - -namespace v8 { -namespace internal { - -TEST(ThreeBitRepresentation) { - // Numeric types and unknown should fit into the short - // representation. - CHECK(TypeInfo::ExpandedRepresentation( - TypeInfo::Unknown().ThreeBitRepresentation()).IsUnknown()); - CHECK(TypeInfo::ExpandedRepresentation( - TypeInfo::Number().ThreeBitRepresentation()).IsNumber()); - CHECK(TypeInfo::ExpandedRepresentation( - TypeInfo::Integer32().ThreeBitRepresentation()).IsInteger32()); - CHECK(TypeInfo::ExpandedRepresentation( - TypeInfo::Smi().ThreeBitRepresentation()).IsSmi()); - CHECK(TypeInfo::ExpandedRepresentation( - TypeInfo::Double().ThreeBitRepresentation()).IsDouble()); - - // Other types should map to unknown. - CHECK(TypeInfo::ExpandedRepresentation( - TypeInfo::Primitive().ThreeBitRepresentation()).IsUnknown()); - CHECK(TypeInfo::ExpandedRepresentation( - TypeInfo::String().ThreeBitRepresentation()).IsUnknown()); -} - -} } // namespace v8::internal