4 files changed, 2 insertions, 126 deletions
diff --git a/compiler/dex/inline_method_analyser.cc b/compiler/dex/inline_method_analyser.cc
index 32019657d3..381db3d21d 100644
--- a/compiler/dex/inline_method_analyser.cc
+++ b/compiler/dex/inline_method_analyser.cc
@@ -33,7 +33,7 @@
  * only to allow the debugger to check whether a method has been inlined.
  */
 
-namespace art {
+namespace art HIDDEN {
 
 namespace {  // anonymous namespace
 
diff --git a/compiler/dex/inline_method_analyser.h b/compiler/dex/inline_method_analyser.h
index e1d652a642..99d07c6152 100644
--- a/compiler/dex/inline_method_analyser.h
+++ b/compiler/dex/inline_method_analyser.h
@@ -28,7 +28,7 @@
  * only to allow the debugger to check whether a method has been inlined.
  */
 
-namespace art {
+namespace art HIDDEN {
 
 class CodeItemDataAccessor;
 
diff --git a/compiler/dex/verification_results.cc b/compiler/dex/verification_results.cc
deleted file mode 100644
index b819d0effa..0000000000
--- a/compiler/dex/verification_results.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "verification_results.h"
-
-#include <android-base/logging.h>
-
-#include "base/mutex-inl.h"
-#include "base/stl_util.h"
-#include "runtime.h"
-#include "thread-current-inl.h"
-#include "thread.h"
-
-namespace art {
-
-VerificationResults::VerificationResults()
-    : uncompilable_methods_lock_("compiler uncompilable methods lock"),
-      rejected_classes_lock_("compiler rejected classes lock") {}
-
-// Non-inline version of the destructor, as it does some implicit work not worth
-// inlining.
-VerificationResults::~VerificationResults() {}
-
-void VerificationResults::AddRejectedClass(ClassReference ref) {
-  {
-    WriterMutexLock mu(Thread::Current(), rejected_classes_lock_);
-    rejected_classes_.insert(ref);
-  }
-  DCHECK(IsClassRejected(ref));
-}
-
-bool VerificationResults::IsClassRejected(ClassReference ref) const {
-  ReaderMutexLock mu(Thread::Current(), rejected_classes_lock_);
-  return rejected_classes_.find(ref) != rejected_classes_.end();
-}
-
-void VerificationResults::AddUncompilableMethod(MethodReference ref) {
-  {
-    WriterMutexLock mu(Thread::Current(), uncompilable_methods_lock_);
-    uncompilable_methods_.insert(ref);
-  }
-  DCHECK(IsUncompilableMethod(ref));
-}
-
-bool VerificationResults::IsUncompilableMethod(MethodReference ref) const {
-  ReaderMutexLock mu(Thread::Current(), uncompilable_methods_lock_);
-  return uncompilable_methods_.find(ref) != uncompilable_methods_.end();
-}
-
-
-}  // namespace art
diff --git a/compiler/dex/verification_results.h b/compiler/dex/verification_results.h
deleted file mode 100644
index b294ed3020..0000000000
--- a/compiler/dex/verification_results.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ART_COMPILER_DEX_VERIFICATION_RESULTS_H_
-#define ART_COMPILER_DEX_VERIFICATION_RESULTS_H_
-
-#include <set>
-
-#include "base/macros.h"
-#include "base/mutex.h"
-#include "dex/class_reference.h"
-#include "dex/method_reference.h"
-
-namespace art {
-
-namespace verifier {
-class VerifierDepsTest;
-}  // namespace verifier
-
-// Used by CompilerCallbacks to track verification information from the Runtime.
-class VerificationResults {
- public:
-  VerificationResults();
-  ~VerificationResults();
-
-  void AddRejectedClass(ClassReference ref) REQUIRES(!rejected_classes_lock_);
-  bool IsClassRejected(ClassReference ref) const REQUIRES(!rejected_classes_lock_);
-
-  void AddUncompilableMethod(MethodReference ref) REQUIRES(!uncompilable_methods_lock_);
-  bool IsUncompilableMethod(MethodReference ref) const REQUIRES(!uncompilable_methods_lock_);
-
- private:
-  // TODO: External locking during CompilerDriver::PreCompile(), no locking during compilation.
-  mutable ReaderWriterMutex uncompilable_methods_lock_ DEFAULT_MUTEX_ACQUIRED_AFTER;
-  std::set<MethodReference> uncompilable_methods_ GUARDED_BY(uncompilable_methods_lock_);
-
-  // Rejected classes.
-  // TODO: External locking during CompilerDriver::PreCompile(), no locking during compilation.
-  mutable ReaderWriterMutex rejected_classes_lock_ DEFAULT_MUTEX_ACQUIRED_AFTER;
-  std::set<ClassReference> rejected_classes_ GUARDED_BY(rejected_classes_lock_);
-
-  friend class verifier::VerifierDepsTest;
-};
-
-}  // namespace art
-
-#endif  // ART_COMPILER_DEX_VERIFICATION_RESULTS_H_