hotspot/src/share/vm/c1/c1_Runtime1.cpp
changeset 29474 81a5c5330d08
parent 29180 50369728b00e
child 30590 14f7f48c1377
--- a/hotspot/src/share/vm/c1/c1_Runtime1.cpp	Fri Mar 06 04:58:52 2015 -0800
+++ b/hotspot/src/share/vm/c1/c1_Runtime1.cpp	Tue Feb 24 17:23:53 2015 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -1120,7 +1120,7 @@
 #ifdef ARM
           if((load_klass_or_mirror_patch_id ||
               stub_id == Runtime1::load_appendix_patching_id) &&
-             !VM_Version::supports_movw()) {
+              nativeMovConstReg_at(copy_buff)->is_pc_relative()) {
             nmethod* nm = CodeCache::find_nmethod(instr_pc);
             address addr = NULL;
             assert(nm != NULL, "invalid nmethod_pc");