Mercurial > hg > truffle

comparison src/share/vm/opto/runtime.cpp @ 6275:957c266d8bc5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Tue, 21 Aug 2012 10:39:19 +0200
parents 4a1894e1cfc7 5142b5110214
children c38f13903fdf
comparison
equal deleted inserted replaced
5891:fd8832ae511d 6275:957c266d8bc5
1 /* 1 /*
2 * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1998, 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.
707 const TypeTuple *range = TypeTuple::make(TypeFunc::Parms+2, fields); 707 const TypeTuple *range = TypeTuple::make(TypeFunc::Parms+2, fields);
708 708
709 return TypeFunc::make(domain, range); 709 return TypeFunc::make(domain, range);
710 } 710 }
711 711
712 //-------------- currentTimeMillis 712 //-------------- currentTimeMillis, currentTimeNanos, etc
713 713
714 const TypeFunc* OptoRuntime::current_time_millis_Type() { 714 const TypeFunc* OptoRuntime::void_long_Type() {
715 // create input type (domain) 715 // create input type (domain)
716 const Type **fields = TypeTuple::fields(0); 716 const Type **fields = TypeTuple::fields(0);
717 const TypeTuple *domain = TypeTuple::make(TypeFunc::Parms+0, fields); 717 const TypeTuple *domain = TypeTuple::make(TypeFunc::Parms+0, fields);
718 718
719 // create result type (range) 719 // create result type (range)
894 894
895 if (n->is_nmethod()) { 895 if (n->is_nmethod()) {
896 methodOop method = ((nmethod*)n)->method(); 896 methodOop method = ((nmethod*)n)->method();
897 tty->print_cr("# Method where it happened %s.%s ", Klass::cast(method->method_holder())->name()->as_C_string(), method->name()->as_C_string()); 897 tty->print_cr("# Method where it happened %s.%s ", Klass::cast(method->method_holder())->name()->as_C_string(), method->name()->as_C_string());
898 tty->print_cr("#"); 898 tty->print_cr("#");
899 if (ShowMessageBoxOnError && UpdateHotSpotCompilerFileOnError) { 899 if (ShowMessageBoxOnError && UpdateHotSpotCompilerFileOnError &&
900 CompilerOracle::has_command_file()) {
900 const char* title = "HotSpot Runtime Error"; 901 const char* title = "HotSpot Runtime Error";
901 const char* question = "Do you want to exclude compilation of this method in future runs?"; 902 const char* question = "Do you want to exclude compilation of this method in future runs?";
902 if (os::message_box(title, question)) { 903 if (os::message_box(title, question)) {
903 CompilerOracle::append_comment_to_file(""); 904 CompilerOracle::append_comment_to_file("");
904 CompilerOracle::append_comment_to_file("Null exception in compiled code resulted in the following exclude"); 905 CompilerOracle::append_comment_to_file("Null exception in compiled code resulted in the following exclude");