Mercurial > hg > icedtea12
changeset 2339:dfb6b319b123
LLVM 2.7 non-product fixes
| author | Gary Benson <gbenson@redhat.com> |
|---|---|
| date | Wed, 12 May 2010 11:16:47 +0100 |
| parents | e93b9abe3db7 |
| children | 56af4f9369ca |
| files | ports/hotspot/src/share/vm/shark/llvmHeaders.hpp ports/hotspot/src/share/vm/shark/sharkBuilder.cpp |
| diffstat | 2 files changed, 21 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp Thu Aug 05 11:44:14 2010 +0200 +++ b/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp Wed May 12 11:16:47 2010 +0100 @@ -1,6 +1,6 @@ /* * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * Copyright 2008, 2009 Red Hat, Inc. + * Copyright 2008, 2009, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,6 +27,11 @@ #undef assert #endif +#ifdef DEBUG + #define SHARK_DEBUG + #undef DEBUG +#endif + #include <llvm/Argument.h> #include <llvm/Constants.h> #include <llvm/DerivedTypes.h> @@ -67,3 +72,11 @@ #else #define assert(p, msg) #endif + +#ifdef DEBUG + #undef DEBUG +#endif +#ifdef SHARK_DEBUG + #define DEBUG + #undef SHARK_DEBUG +#endif
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Thu Aug 05 11:44:14 2010 +0200 +++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Wed May 12 11:16:47 2010 +0100 @@ -498,7 +498,13 @@ if (isa<PointerType>(value->getType())) value = CreatePtrToInt(value, SharkType::intptr_type()); - else if (value->getType()->isInteger()) + else if (value->getType()-> +#if SHARK_LLVM_VERSION >= 27 + isIntegerTy() +#else + isInteger() +#endif + ) value = CreateIntCast(value, SharkType::intptr_type(), false); else Unimplemented();