--- old/src/hotspot/share/code/codeHeapState.cpp	2019-01-06 21:49:52.986522683 +0900
+++ new/src/hotspot/share/code/codeHeapState.cpp	2019-01-06 21:49:52.637522626 +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);
--- old/src/hotspot/share/compiler/methodMatcher.cpp	2019-01-06 21:49:53.810522819 +0900
+++ new/src/hotspot/share/compiler/methodMatcher.cpp	2019-01-06 21:49:53.452522760 +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,10 @@
   }
 }
 
+#ifdef _WINDOWS
+#pragma warning(push)
+#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 +310,9 @@
     error_msg = "Could not parse method pattern";
   }
 }
+#ifdef _WINDOWS
+#pragma warning(pop)
+#endif
 
 bool MethodMatcher::matches(const methodHandle& method) const {
   Symbol* class_name  = method->method_holder()->name();