Skip to content
Permalink
Browse files
8241918: [lworld] Build failures after JDK-8236522
Reviewed-by: dsimms
  • Loading branch information
TobiHartmann committed Mar 31, 2020
1 parent 2a6ddbd commit ece2a2d3ce28c78720794d62d1456815f40e1c85
Showing 1 changed file with 6 additions and 8 deletions.
@@ -75,8 +75,8 @@ class StringMatcher {
// These do not get properly inlined.
// For full performance, this should be a template class
// parameterized by two function arguments.
const getc_function_t* _pattern_getc;
const getc_function_t* _string_getc;
getc_function_t* _pattern_getc;
getc_function_t* _string_getc;

public:
StringMatcher(getc_function_t pattern_getc,
@@ -273,7 +273,7 @@ class ClassListMatcher : public StringMatcher {
}
};

static bool class_list_match_sane();
DEBUG_ONLY(static bool class_list_match_sane();)

bool StringUtils::class_list_match(const char* class_pattern_list,
const char* class_name) {
@@ -285,17 +285,15 @@ bool StringUtils::class_list_match(const char* class_pattern_list,
}

#ifdef ASSERT
static void
class_list_match_sane(const char* pat, const char* str, bool result = true) {
static void class_list_match_sane(const char* pat, const char* str, bool result = true) {
if (result) {
assert(StringUtils::class_list_match(pat, str), "%s ~ %s", pat, str);
} else {
assert(!StringUtils::class_list_match(pat, str), "%s !~ %s", pat, str);
}
}

static bool
class_list_match_sane() {
static bool class_list_match_sane() {
static bool done = false;
if (done) return true;
done = true;
@@ -311,7 +309,7 @@ class_list_match_sane() {
class_list_match_sane("\\*foo", "*foo");
const char* foo = "foo!";
char buf[100], buf2[100];
const int m = strlen(foo);
const int m = (int)strlen(foo);
for (int n = 0; n <= 1; n++) { // neg: 0=>pos
for (int a = -1; a <= 1; a++) { // alt: -1/X,T 0/T 1/T,Y
for (int i = 0; i <= m; i++) { // 1st substring [i:j]

0 comments on commit ece2a2d

Please sign in to comment.