From 9865bde5d822f56c4732214c2005dfcaa41f94cf Mon Sep 17 00:00:00 2001
From: Mathieu Chartier <mathieuc@google.com>
Date: Mon, 21 Dec 2015 09:58:16 -0800
Subject: Rename NullHandle to ScopedNullHandle

This makes it clearer that is invalid to do things like:
Handle<T> h = ScopedNullHandle<T>();

Bug: 26233305
Change-Id: I6d8f54eae01ec2e901cb7043afa853ea77db79fe
---
 compiler/optimizing/builder.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'compiler/optimizing/builder.h')

diff --git a/compiler/optimizing/builder.h b/compiler/optimizing/builder.h
index ca71c32802..73e85bb5e3 100644
--- a/compiler/optimizing/builder.h
+++ b/compiler/optimizing/builder.h
@@ -80,7 +80,8 @@ class HGraphBuilder : public ValueObject {
         can_use_baseline_for_string_init_(true),
         compilation_stats_(nullptr),
         interpreter_metadata_(nullptr),
-        dex_cache_(NullHandle<mirror::DexCache>()) {}
+        null_dex_cache_(),
+        dex_cache_(null_dex_cache_) {}
 
   bool BuildGraph(const DexFile::CodeItem& code);
 
@@ -371,6 +372,7 @@ class HGraphBuilder : public ValueObject {
   const uint8_t* interpreter_metadata_;
 
   // Dex cache for dex_file_.
+  ScopedNullHandle<mirror::DexCache> null_dex_cache_;
   Handle<mirror::DexCache> dex_cache_;
 
   DISALLOW_COPY_AND_ASSIGN(HGraphBuilder);
-- 
cgit v1.2.3-59-g8ed1b