From 31dde99258b4dde999538b613bb4c65828cd62e6 Mon Sep 17 00:00:00 2001
From: Carmi Grushko <carmi@google.com>
Date: Tue, 3 Nov 2015 19:23:36 +0000
Subject: Pass AspectWithParameters instead of separately passing
 AspectParameters and aspect-attributes. The former contains both.

--
MOS_MIGRATED_REVID=106961145
---
 .../devtools/build/lib/analysis/ConfiguredTargetFactory.java     | 9 +++++----
 .../com/google/devtools/build/lib/skyframe/AspectFunction.java   | 3 +--
 .../google/devtools/build/lib/skyframe/SkyframeBuildView.java    | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java
index 91c4299c79..b52f5a65e3 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java
@@ -14,6 +14,7 @@
 
 package com.google.devtools.build.lib.analysis;
 
+import com.google.devtools.build.lib.packages.AspectWithParameters;
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ListMultimap;
@@ -290,8 +291,7 @@ public final class ConfiguredTargetFactory {
       AnalysisEnvironment env,
       RuleConfiguredTarget associatedTarget,
       ConfiguredAspectFactory aspectFactory,
-      AspectParameters aspectParameters,
-      Map<String, Attribute> aspectAttributes,
+      AspectWithParameters aspectWithParameters,
       ListMultimap<Attribute, ConfiguredTarget> prerequisiteMap,
       Set<ConfigMatchingProvider> configConditions,
       BuildConfiguration hostConfiguration)
@@ -305,14 +305,15 @@ public final class ConfiguredTargetFactory {
         .setVisibility(convertVisibility(
             prerequisiteMap, env.getEventHandler(), associatedTarget.getTarget(), null))
         .setPrerequisites(prerequisiteMap)
-        .setAspectAttributes(aspectAttributes)
+        .setAspectAttributes(aspectWithParameters.getDefinition().getAttributes())
         .setConfigConditions(configConditions)
         .build();
     if (ruleContext.hasErrors()) {
       return null;
     }
 
-    return aspectFactory.create(associatedTarget, ruleContext, aspectParameters);
+    return aspectFactory.create(associatedTarget, ruleContext,
+        aspectWithParameters.getParameters());
   }
 
   /**
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
index 41af5ff3f2..1206ccee1d 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
@@ -224,10 +224,9 @@ public final class AspectFunction implements SkyFunction {
       return null;
     }
 
-    AspectParameters aspectParams = key.getParameters();
     Aspect aspect = view.createAspect(
         analysisEnvironment, associatedTarget, aspectFactory, directDeps, configConditions,
-        aspectParams, key.getAspect().getDefinition(aspectParams).getAttributes());
+        key.getAspectWithParameters());
 
     events.replayOn(env.getListener());
     if (events.hasErrors()) {
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
index 6912dc4423..24c1c5fb84 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
@@ -35,6 +35,7 @@ import com.google.devtools.build.lib.actions.MutableActionGraph.ActionConflictEx
 import com.google.devtools.build.lib.analysis.AnalysisEnvironment;
 import com.google.devtools.build.lib.analysis.AnalysisFailureEvent;
 import com.google.devtools.build.lib.analysis.Aspect;
+import com.google.devtools.build.lib.packages.AspectWithParameters;
 import com.google.devtools.build.lib.analysis.BlazeDirectories;
 import com.google.devtools.build.lib.analysis.BuildView;
 import com.google.devtools.build.lib.analysis.CachingAnalysisEnvironment;
@@ -528,11 +529,10 @@ public final class SkyframeBuildView {
       ConfiguredAspectFactory aspectFactory,
       ListMultimap<Attribute, ConfiguredTarget> prerequisiteMap,
       Set<ConfigMatchingProvider> configConditions,
-      AspectParameters aspectParameters,
-      Map<String, Attribute> aspectAttributes)
+      AspectWithParameters aspectWithParameters)
           throws InterruptedException {
-    return factory.createAspect(env, associatedTarget, aspectFactory, aspectParameters,
-        aspectAttributes, prerequisiteMap, configConditions,
+    return factory.createAspect(env, associatedTarget, aspectFactory, aspectWithParameters,
+        prerequisiteMap, configConditions,
         getHostConfiguration(associatedTarget.getConfiguration()));
   }
 
-- 
cgit v1.2.3