src/share/vm/c1/c1_LIRAssembler.cpp

rev 9032 : 8138952: C1: Distinguish between PPC32 and PPC64
Reviewed-by:

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.

@@ -554,10 +554,17 @@
       leal(op->in_opr(), op->result_opr());
       break;
 
     case lir_null_check:
       if (GenerateCompilerNullChecks) {
+#ifdef PPC64
+        if (!TrapBasedNullChecks) {
+          assert(op->in_opr()->is_single_cpu(), "expected");
+          explicit_null_check(op->in_opr()->as_register(), op->info());
+          break;
+        }
+#endif
         add_debug_info_for_null_check_here(op->info());
 
         if (op->in_opr()->is_single_cpu()) {
           _masm->null_check(op->in_opr()->as_register());
         } else {