Mercurial > hg > graal-jvmci-8
comparison src/share/vm/code/codeBlob.cpp @ 17937:78bbf4d43a14
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 | 469216acdb28 |
children | 52b4284cb496 094cbdffa87d |
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. |
528 void CodeBlob::verify() { | 528 void CodeBlob::verify() { |
529 ShouldNotReachHere(); | 529 ShouldNotReachHere(); |
530 } | 530 } |
531 | 531 |
532 void CodeBlob::print_on(outputStream* st) const { | 532 void CodeBlob::print_on(outputStream* st) const { |
533 st->print_cr("[CodeBlob (" INTPTR_FORMAT ")]", this); | 533 st->print_cr("[CodeBlob (" INTPTR_FORMAT ")]", p2i(this)); |
534 st->print_cr("Framesize: %d", _frame_size); | 534 st->print_cr("Framesize: %d", _frame_size); |
535 } | 535 } |
536 | 536 |
537 void CodeBlob::print_value_on(outputStream* st) const { | 537 void CodeBlob::print_value_on(outputStream* st) const { |
538 st->print_cr("[CodeBlob]"); | 538 st->print_cr("[CodeBlob]"); |
546 CodeBlob::print_on(st); | 546 CodeBlob::print_on(st); |
547 print_value_on(st); | 547 print_value_on(st); |
548 } | 548 } |
549 | 549 |
550 void BufferBlob::print_value_on(outputStream* st) const { | 550 void BufferBlob::print_value_on(outputStream* st) const { |
551 st->print_cr("BufferBlob (" INTPTR_FORMAT ") used for %s", this, name()); | 551 st->print_cr("BufferBlob (" INTPTR_FORMAT ") used for %s", p2i(this), name()); |
552 } | 552 } |
553 | 553 |
554 void RuntimeStub::verify() { | 554 void RuntimeStub::verify() { |
555 // unimplemented | 555 // unimplemented |
556 } | 556 } |
557 | 557 |
558 void RuntimeStub::print_on(outputStream* st) const { | 558 void RuntimeStub::print_on(outputStream* st) const { |
559 ttyLocker ttyl; | 559 ttyLocker ttyl; |
560 CodeBlob::print_on(st); | 560 CodeBlob::print_on(st); |
561 st->print("Runtime Stub (" INTPTR_FORMAT "): ", this); | 561 st->print("Runtime Stub (" INTPTR_FORMAT "): ", p2i(this)); |
562 st->print_cr(name()); | 562 st->print_cr("%s", name()); |
563 Disassembler::decode((CodeBlob*)this, st); | 563 Disassembler::decode((CodeBlob*)this, st); |
564 } | 564 } |
565 | 565 |
566 void RuntimeStub::print_value_on(outputStream* st) const { | 566 void RuntimeStub::print_value_on(outputStream* st) const { |
567 st->print("RuntimeStub (" INTPTR_FORMAT "): ", this); st->print(name()); | 567 st->print("RuntimeStub (" INTPTR_FORMAT "): ", p2i(this)); st->print("%s", name()); |
568 } | 568 } |
569 | 569 |
570 void SingletonBlob::verify() { | 570 void SingletonBlob::verify() { |
571 // unimplemented | 571 // unimplemented |
572 } | 572 } |
573 | 573 |
574 void SingletonBlob::print_on(outputStream* st) const { | 574 void SingletonBlob::print_on(outputStream* st) const { |
575 ttyLocker ttyl; | 575 ttyLocker ttyl; |
576 CodeBlob::print_on(st); | 576 CodeBlob::print_on(st); |
577 st->print_cr(name()); | 577 st->print_cr("%s", name()); |
578 Disassembler::decode((CodeBlob*)this, st); | 578 Disassembler::decode((CodeBlob*)this, st); |
579 } | 579 } |
580 | 580 |
581 void SingletonBlob::print_value_on(outputStream* st) const { | 581 void SingletonBlob::print_value_on(outputStream* st) const { |
582 st->print_cr(name()); | 582 st->print_cr("%s", name()); |
583 } | 583 } |
584 | 584 |
585 void DeoptimizationBlob::print_value_on(outputStream* st) const { | 585 void DeoptimizationBlob::print_value_on(outputStream* st) const { |
586 st->print_cr("Deoptimization (frame not available)"); | 586 st->print_cr("Deoptimization (frame not available)"); |
587 } | 587 } |