From 2b79984e04a661cf0cecf85978ccd832fe97a985 Mon Sep 17 00:00:00 2001
From: Calin Juravle <calin@google.com>
Date: Wed, 20 May 2015 14:14:18 +0000
Subject: [PATCH] Revert "Add test for Change-Id:
 Ied0412a01922b40a3f5d89bed49707498582abc1"

This reverts commit 0f675d8d70934762a5ed70f0734bd19eecfe9680.

The test name is too long...

Change-Id: I4496501e73dcf6424e9c58b331e3d3b241aa7917
---
 compiler/optimizing/graph_visualizer.cc            | 10 ----
 .../expected.txt                                   |  0
 .../info.txt                                       |  1 -
 .../src/Main.java                                  | 53 ----------------------
 4 files changed, 64 deletions(-)
 delete mode 100644 test/486-checker-instanceof-checkcast-mustdonullcheck/expected.txt
 delete mode 100644 test/486-checker-instanceof-checkcast-mustdonullcheck/info.txt
 delete mode 100644 test/486-checker-instanceof-checkcast-mustdonullcheck/src/Main.java

diff --git a/compiler/optimizing/graph_visualizer.cc b/compiler/optimizing/graph_visualizer.cc
index 739fb76f8..e0a9c6f08 100644
--- a/compiler/optimizing/graph_visualizer.cc
+++ b/compiler/optimizing/graph_visualizer.cc
@@ -253,16 +253,6 @@ class HGraphVisualizerPrinter : public HGraphVisitor {
     StartAttributeStream("kind") << barrier->GetBarrierKind();
   }
 
-  void VisitCheckCast(HCheckCast* check_cast) OVERRIDE {
-    StartAttributeStream("must_do_null_check") << std::boolalpha << check_cast->MustDoNullCheck()
-      << std::noboolalpha;
-  }
-
-  void VisitInstanceOf(HInstanceOf* instance_of) OVERRIDE {
-    StartAttributeStream("must_do_null_check") << std::boolalpha << instance_of->MustDoNullCheck()
-      << std::noboolalpha;
-  }
-
   bool IsPass(const char* name) {
     return strcmp(pass_name_, name) == 0;
   }
diff --git a/test/486-checker-instanceof-checkcast-mustdonullcheck/expected.txt b/test/486-checker-instanceof-checkcast-mustdonullcheck/expected.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/test/486-checker-instanceof-checkcast-mustdonullcheck/info.txt b/test/486-checker-instanceof-checkcast-mustdonullcheck/info.txt
deleted file mode 100644
index 494ff1cbc..000000000
--- a/test/486-checker-instanceof-checkcast-mustdonullcheck/info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Verifies MustDoNullCheck() on InstanceOf and CheckCast
diff --git a/test/486-checker-instanceof-checkcast-mustdonullcheck/src/Main.java b/test/486-checker-instanceof-checkcast-mustdonullcheck/src/Main.java
deleted file mode 100644
index f285566ea..000000000
--- a/test/486-checker-instanceof-checkcast-mustdonullcheck/src/Main.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2015 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.
- */
-
-public class Main {
-  // CHECK-START: void Main.InstanceOfPreChecked(java.lang.Object) instruction_simplifier (after)
-  // CHECK:       InstanceOf must_do_null_check:false
-  public void InstanceOfPreChecked(Object o) throws Exception {
-    o.toString();
-    if (o instanceof Main) {
-      throw new Exception();
-    }
-  }
-
-  // CHECK-START: void Main.InstanceOf(java.lang.Object) instruction_simplifier (after)
-  // CHECK:       InstanceOf must_do_null_check:true
-  public void InstanceOf(Object o) throws Exception {
-    if (o instanceof Main) {
-      throw new Exception();
-    }
-  }
-
-  // CHECK-START: void Main.CheckCastPreChecked(java.lang.Object) instruction_simplifier (after)
-  // CHECK:       CheckCast must_do_null_check:false
-  public void CheckCastPreChecked(Object o) {
-    o.toString();
-    ((Main)o).Bar();
-  }
-
-  // CHECK-START: void Main.CheckCast(java.lang.Object) instruction_simplifier (after)
-  // CHECK:       CheckCast must_do_null_check:true
-  public void CheckCast(Object o) {
-    ((Main)o).Bar();
-  }
-
-  void Bar() {throw new RuntimeException();}
-
-  public static void main(String[] sa) {
-    Main t = new Main();
-  }
-}
-- 
2.11.0