Fix SkylarkCallable-annotation detection to appropriately handle methods with generic parameters

RELNOTES: None.
PiperOrigin-RevId: 197932265

1 files changed, 10 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
index ab616e5c90..c02e014353 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
@@ -1408,8 +1408,12 @@ public class BuildConfiguration implements BuildConfigurationApi {
             repositoryName, outputDirName, directories, mainRepositoryName);
   }
 
-  /** Returns the bin directory for this build configuration. */
   @Override
+  public ArtifactRoot getBinDir() {
+    return getBinDirectory(RepositoryName.MAIN);
+  }
+
+  /** Returns the bin directory for this build configuration. */
   public ArtifactRoot getBinDirectory() {
     return getBinDirectory(RepositoryName.MAIN);
   }
@@ -1442,8 +1446,12 @@ public class BuildConfiguration implements BuildConfigurationApi {
             repositoryName, outputDirName, directories, mainRepositoryName);
   }
 
-  /** Returns the genfiles directory for this build configuration. */
   @Override
+  public ArtifactRoot getGenfilesDir() {
+    return getGenfilesDirectory(RepositoryName.MAIN);
+  }
+
+  /** Returns the genfiles directory for this build configuration. */
   public ArtifactRoot getGenfilesDirectory() {
     return getGenfilesDirectory(RepositoryName.MAIN);
   }