Mercurial > hg > graal-compiler
diff src/share/vm/c1/c1_InstructionPrinter.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 | ce0cc25bc5e2 |
children |
line wrap: on
line diff
--- a/src/share/vm/c1/c1_InstructionPrinter.cpp Thu May 15 18:23:26 2014 -0400 +++ b/src/share/vm/c1/c1_InstructionPrinter.cpp Thu May 22 15:52:41 2014 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -134,23 +134,23 @@ if (value->is_null_object()) { output()->print("null"); } else if (!value->is_loaded()) { - output()->print("<unloaded object " PTR_FORMAT ">", value); + output()->print("<unloaded object " INTPTR_FORMAT ">", p2i(value)); } else { - output()->print("<object " PTR_FORMAT " klass=", value->constant_encoding()); + output()->print("<object " INTPTR_FORMAT " klass=", p2i(value->constant_encoding())); print_klass(value->klass()); output()->print(">"); } } else if (type->as_InstanceConstant() != NULL) { ciInstance* value = type->as_InstanceConstant()->value(); if (value->is_loaded()) { - output()->print("<instance " PTR_FORMAT " klass=", value->constant_encoding()); + output()->print("<instance " INTPTR_FORMAT " klass=", p2i(value->constant_encoding())); print_klass(value->klass()); output()->print(">"); } else { - output()->print("<unloaded instance " PTR_FORMAT ">", value); + output()->print("<unloaded instance " INTPTR_FORMAT ">", p2i(value)); } } else if (type->as_ArrayConstant() != NULL) { - output()->print("<array " PTR_FORMAT ">", type->as_ArrayConstant()->value()->constant_encoding()); + output()->print("<array " INTPTR_FORMAT ">", p2i(type->as_ArrayConstant()->value()->constant_encoding())); } else if (type->as_ClassConstant() != NULL) { ciInstanceKlass* klass = type->as_ClassConstant()->value(); if (!klass->is_loaded()) { @@ -268,7 +268,7 @@ void InstructionPrinter::print_unsafe_op(UnsafeOp* op, const char* name) { - output()->print(name); + output()->print("%s", name); output()->print(".("); } @@ -479,7 +479,7 @@ if (x->declared_type()->is_klass()) print_klass(x->declared_type()->as_klass()); else - output()->print(type2name(x->declared_type()->basic_type())); + output()->print("%s", type2name(x->declared_type()->basic_type())); }