OpenJDK / amber / amber
changeset 54222:a242fc65ef2e
8216154: C4819 warnings at HotSpot sources on Windows
Reviewed-by: kbarrett, tschatzl
| author | ysuenaga |
|---|---|
| date | Tue, 08 Jan 2019 10:35:06 +0900 |
| parents | 03efcf7fc34b |
| children | 76f7dbf458fe |
| files | src/hotspot/share/code/codeHeapState.cpp src/hotspot/share/compiler/methodMatcher.cpp |
| diffstat | 2 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/code/codeHeapState.cpp Mon Jan 07 15:20:23 2019 -0500 +++ b/src/hotspot/share/code/codeHeapState.cpp Tue Jan 08 10:35:06 2019 +0900 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2018 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -1976,7 +1976,7 @@ ast->print_cr(" The age of a compiled method in the CodeHeap is not available as a\n" " time stamp. Instead, a relative age is deducted from the method's compilation ID.\n" " Age information is available for tier1 and tier2 methods only. There is no\n" - " age information for stubs and blobs, because they have no compilation ID assigned.\n" + " age information for stubs and blobs, because they have no compilation ID assigned.\n" " Information for the youngest method (highest ID) in the granule is printed.\n" " Refer to the legend to learn how method age is mapped to the displayed digit."); print_age_legend(ast);
--- a/src/hotspot/share/compiler/methodMatcher.cpp Mon Jan 07 15:20:23 2019 -0500 +++ b/src/hotspot/share/compiler/methodMatcher.cpp Tue Jan 08 10:35:06 2019 +0900 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, 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 @@ -237,6 +237,12 @@ } } +#ifdef _MSC_VER +#pragma warning(push) +// warning C4189: The file contains a character that cannot be represented +// in the current code page +#pragma warning(disable : 4819) +#endif void MethodMatcher::parse_method_pattern(char*& line, const char*& error_msg, MethodMatcher* matcher) { MethodMatcher::Mode c_match; MethodMatcher::Mode m_match; @@ -306,6 +312,9 @@ error_msg = "Could not parse method pattern"; } } +#ifdef _MSC_VER +#pragma warning(pop) +#endif bool MethodMatcher::matches(const methodHandle& method) const { Symbol* class_name = method->method_holder()->name();