comparison src/share/vm/opto/c2compiler.cpp @ 14521:29ccc4cbabca

Merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 12 Mar 2014 13:30:08 +0100
parents bb9356ec5967
children 4ca6dc0799b6
comparison
equal deleted inserted replaced
14520:f84115370178 14521:29ccc4cbabca
1 /* 1 /*
2 * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
38 # include "adfiles/ad_zero.hpp" 38 # include "adfiles/ad_zero.hpp"
39 #endif 39 #endif
40 #ifdef TARGET_ARCH_MODEL_arm 40 #ifdef TARGET_ARCH_MODEL_arm
41 # include "adfiles/ad_arm.hpp" 41 # include "adfiles/ad_arm.hpp"
42 #endif 42 #endif
43 #ifdef TARGET_ARCH_MODEL_ppc 43 #ifdef TARGET_ARCH_MODEL_ppc_32
44 # include "adfiles/ad_ppc.hpp" 44 # include "adfiles/ad_ppc_32.hpp"
45 #endif
46 #ifdef TARGET_ARCH_MODEL_ppc_64
47 # include "adfiles/ad_ppc_64.hpp"
45 #endif 48 #endif
46 49
47 // register information defined by ADLC 50 // register information defined by ADLC
48 extern const char register_save_policy[]; 51 extern const char register_save_policy[];
49 extern const int register_save_type[]; 52 extern const int register_save_type[];
109 112
110 void C2Compiler::compile_method(ciEnv* env, ciMethod* target, int entry_bci) { 113 void C2Compiler::compile_method(ciEnv* env, ciMethod* target, int entry_bci) {
111 assert(is_initialized(), "Compiler thread must be initialized"); 114 assert(is_initialized(), "Compiler thread must be initialized");
112 115
113 bool subsume_loads = SubsumeLoads; 116 bool subsume_loads = SubsumeLoads;
114 bool do_escape_analysis = DoEscapeAnalysis && !env->jvmti_can_access_local_variables(); 117 bool do_escape_analysis = DoEscapeAnalysis && !env->should_retain_local_variables();
115 bool eliminate_boxing = EliminateAutoBox; 118 bool eliminate_boxing = EliminateAutoBox;
116 while (!env->failing()) { 119 while (!env->failing()) {
117 // Attempt to compile while subsuming loads into machine instructions. 120 // Attempt to compile while subsuming loads into machine instructions.
118 Compile C(env, this, target, entry_bci, subsume_loads, do_escape_analysis, eliminate_boxing); 121 Compile C(env, this, target, entry_bci, subsume_loads, do_escape_analysis, eliminate_boxing);
119 122