Merge remote-tracking branch 'origin/master' into BETA_JAVA_12
# Conflicts:
# org.eclipse.jdt.compiler.apt/src/org/eclipse/jdt/internal/compiler/apt/util/JrtFileSystem.java
# org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/JrtFileSystem.java
# org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/JRTUtil.java
# org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java
# org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JrtPackageFragmentRoot.java
# org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/ClasspathJrtWithReleaseOption.java
Change-Id: I284c23829a6de8131b7ca33af8f27bfc95ab4574
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericsRegressionTest_1_8.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericsRegressionTest_1_8.java
index 1504327..e2fe76e 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericsRegressionTest_1_8.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericsRegressionTest_1_8.java
@@ -9572,4 +9572,17 @@
"}\n"
});
}
+ public void testBug545121() {
+ runConformTest(
+ new String[] {
+ "X.java",
+ "public class X {\n" +
+ " <T extends V, U extends T, V> void foo(U arg1, T arg2, V arg3) {}\n" +
+ "\n" +
+ " void check() {\n" +
+ " foo((Long) 0l, 0d, \"\");\n" +
+ " }\n" +
+ "}\n"
+ });
+ }
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/CaptureBinding18.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/CaptureBinding18.java
index 2dc50f4..447df46 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/CaptureBinding18.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/CaptureBinding18.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2013, 2014 GK Software AG.
+ * Copyright (c) 2013, 2019 GK Software AG.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -155,22 +155,15 @@
rightIntersectingTypes = ((IntersectionTypeBinding18) otherType).intersectingTypes;
}
if (rightIntersectingTypes != null) {
- int numRequired = rightIntersectingTypes.length;
- TypeBinding[] required = new TypeBinding[numRequired];
- System.arraycopy(rightIntersectingTypes, 0, required, 0, numRequired);
- for (int i = 0; i < length; i++) {
- TypeBinding provided = this.upperBounds[i];
- for (int j = 0; j < required.length; j++) {
- if (required[j] == null) continue;
- if (provided.isCompatibleWith(required[j], captureScope)) {
- required[j] = null;
- if (--numRequired == 0)
- return true;
- break;
- }
+ nextRequired:
+ for (TypeBinding required : rightIntersectingTypes) {
+ for (TypeBinding provided : this.upperBounds) {
+ if (provided.isCompatibleWith(required, captureScope))
+ continue nextRequired;
}
+ return false;
}
- return false;
+ return true;
}
for (int i = 0; i < length; i++) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/IntersectionTypeBinding18.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/IntersectionTypeBinding18.java
index 649ff04..e30bbb5 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/IntersectionTypeBinding18.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/IntersectionTypeBinding18.java
@@ -187,22 +187,15 @@
rightIntersectingTypes = ((IntersectionTypeBinding18) right).intersectingTypes;
}
if (rightIntersectingTypes != null) {
- int numRequired = rightIntersectingTypes.length;
- TypeBinding[] required = new TypeBinding[numRequired];
- System.arraycopy(rightIntersectingTypes, 0, required, 0, numRequired);
- for (int i = 0; i < this.length; i++) {
- TypeBinding provided = this.intersectingTypes[i];
- for (int j = 0; j < required.length; j++) {
- if (required[j] == null) continue;
- if (provided.isCompatibleWith(required[j], scope)) {
- required[j] = null;
- if (--numRequired == 0)
- return true;
- break;
- }
+ nextRequired:
+ for (TypeBinding required : rightIntersectingTypes) {
+ for (TypeBinding provided : this.intersectingTypes) {
+ if (provided.isCompatibleWith(required, scope))
+ continue nextRequired;
}
+ return false;
}
- return false;
+ return true;
}
// normal case:
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/ClasspathJrt.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/ClasspathJrt.java
index 9576ce7..a3aaa8f 100644
--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/ClasspathJrt.java
+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/ClasspathJrt.java
@@ -109,6 +109,9 @@
}
this.packageSet = new SimpleSet(41);
this.packageSet.add(""); //$NON-NLS-1$
+ if (name.endsWith("/")) { //$NON-NLS-1$
+ name = name.substring(0, name.length() - 1);
+ }
packagesInModule.put(name, this.packageSet);
return FileVisitResult.CONTINUE;
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/ClasspathJrtWithReleaseOption.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/ClasspathJrtWithReleaseOption.java
index 9a38839..95f3523 100644
--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/ClasspathJrtWithReleaseOption.java
+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/ClasspathJrtWithReleaseOption.java
@@ -208,6 +208,9 @@
public FileVisitResult visitModule(Path path, String name) throws IOException {
this.packageSet = new SimpleSet(41);
this.packageSet.add(""); //$NON-NLS-1$
+ if (name.endsWith("/")) { //$NON-NLS-1$
+ name = name.substring(0, name.length() - 1);
+ }
packagesInModule.put(name, this.packageSet);
return FileVisitResult.CONTINUE;
}
