Mercurial > hg > truffle

comparison src/share/vm/compiler/compilerOracle.cpp @ 17937:78bbf4d43a14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8037816: Fix for 8036122 breaks build with Xcode5/clang 8043029: Change 8037816 breaks HS build with older GCC versions which don't support diagnostic pragmas 8043164: Format warning in traceStream.hpp Summary: Backport of main fix + two corrections, enables clang compilation, turns on format attributes, corrects/mutes warnings Reviewed-by: kvn, coleenp, iveresov, twisti
author drchase
date Thu, 22 May 2014 15:52:41 -0400
parents 55fb97c4c58d
children 52b4284cb496 14b356bbca27
comparison
equal deleted inserted replaced
17935:7384f6a12fc1 17937:78bbf4d43a14
1 /* 1 /*
2 * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1998, 2014, 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.
537 } 537 }
538 } else { 538 } else {
539 tty->print_cr("CompilerOracle: unrecognized line"); 539 tty->print_cr("CompilerOracle: unrecognized line");
540 tty->print_cr(" \"%s\"", original_line); 540 tty->print_cr(" \"%s\"", original_line);
541 if (error_msg != NULL) { 541 if (error_msg != NULL) {
542 tty->print_cr(error_msg); 542 tty->print_cr("%s", error_msg);
543 } 543 }
544 } 544 }
545 } 545 }
546 546
547 static const char* default_cc_file = ".hotspot_compiler"; 547 static const char* default_cc_file = ".hotspot_compiler";
659 659
660 bool have_colon = (strstr(line, "::") != NULL); 660 bool have_colon = (strstr(line, "::") != NULL);
661 char method_sep = have_colon ? ':' : '.'; 661 char method_sep = have_colon ? ':' : '.';
662 662
663 if (Verbose) { 663 if (Verbose) {
664 tty->print_cr(line); 664 tty->print_cr("%s", line);
665 } 665 }
666 666
667 ResourceMark rm; 667 ResourceMark rm;
668 while (*line != '\0') { 668 while (*line != '\0') {
669 MethodMatcher::Mode c_match = MethodMatcher::Exact; 669 MethodMatcher::Mode c_match = MethodMatcher::Exact;