diff src/share/vm/opto/regalloc.cpp @ 14909:4ca6dc0799b6

Backout jdk9 merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 01 Apr 2014 13:57:07 +0200
parents abec000618bf
children 89152779163c
line wrap: on
line diff
--- a/src/share/vm/opto/regalloc.cpp	Tue Apr 01 14:09:03 2014 +0200
+++ b/src/share/vm/opto/regalloc.cpp	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
@@ -77,9 +77,7 @@
   assert( reg <  _matcher._old_SP ||
           (reg >= OptoReg::add(_matcher._old_SP,C->out_preserve_stack_slots()) &&
            reg <  _matcher._in_arg_limit) ||
-          reg >=  OptoReg::add(_matcher._new_SP, C->out_preserve_stack_slots()) ||
-          // Allow return_addr in the out-preserve area.
-          reg == _matcher.return_addr(),
+          reg >=  OptoReg::add(_matcher._new_SP,C->out_preserve_stack_slots()),
           "register allocated in a preserve area" );
   return reg2offset_unchecked( reg );
 }