comparison src/share/vm/opto/callGenerator.hpp @ 6948:e522a00b91aa

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author Doug Simon <doug.simon@oracle.com>
date Mon, 12 Nov 2012 23:14:12 +0100
parents 957c266d8bc5 a3ecd773a7b9
children 989155e2d07a
comparison
equal deleted inserted replaced
6711:ae13cc658b80 6948:e522a00b91aa
1 /* 1 /*
2 * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2000, 2012, 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.
141 Deoptimization::DeoptAction action); 141 Deoptimization::DeoptAction action);
142 142
143 // Registry for intrinsics: 143 // Registry for intrinsics:
144 static CallGenerator* for_intrinsic(ciMethod* m); 144 static CallGenerator* for_intrinsic(ciMethod* m);
145 static void register_intrinsic(ciMethod* m, CallGenerator* cg); 145 static void register_intrinsic(ciMethod* m, CallGenerator* cg);
146 static CallGenerator* for_predicted_intrinsic(CallGenerator* intrinsic,
147 CallGenerator* cg);
148 virtual Node* generate_predicate(JVMState* jvms) { return NULL; };
146 149
147 static void print_inlining(ciMethod* callee, int inline_level, int bci, const char* msg) { 150 static void print_inlining(ciMethod* callee, int inline_level, int bci, const char* msg) {
148 if (PrintInlining) 151 if (PrintInlining)
149 CompileTask::print_inlining(callee, inline_level, bci, msg); 152 CompileTask::print_inlining(callee, inline_level, bci, msg);
150 } 153 }