Remove all code and .proto references to --record_rule_instantiation_callstack flag.
PiperOrigin-RevId: 334474003
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/RepositoryResolvedEvent.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/RepositoryResolvedEvent.java
index f86b4b0..3f1ef13 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/repository/RepositoryResolvedEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/RepositoryResolvedEvent.java
@@ -224,8 +224,9 @@
// Emit stack of rule instantiation.
buf.append("Repository ").append(rule.getName()).append(" instantiated at:\n");
ImmutableList<StarlarkThread.CallStackEntry> stack = rule.getCallStack().toList();
+ // TODO: Callstack should always be available for bazel.
if (stack.isEmpty()) {
- buf.append(" no stack (--record_rule_instantiation_callstack not enabled)\n");
+ buf.append(" callstack not available\n");
} else {
for (StarlarkThread.CallStackEntry frame : stack) {
buf.append(" ").append(frame.location).append(": in ").append(frame.name).append('\n');
diff --git a/src/main/java/com/google/devtools/build/lib/packages/RuleFactory.java b/src/main/java/com/google/devtools/build/lib/packages/RuleFactory.java
index b1a402c..597b897 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/RuleFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/RuleFactory.java
@@ -115,8 +115,7 @@
pkgBuilder, attributeValues, callstack, label, recordRuleInstantiationCallstack);
// The raw stack is of the form [<toplevel>@BUILD:1, macro@lib.bzl:1, cc_library@<builtin>].
- // If we're recording it (--record_rule_instantiation_callstack),
- // pop the innermost frame for the rule, since it's obvious.
+ // Pop the innermost frame for the rule, since it's obvious.
callstack =
recordRuleInstantiationCallstack
? callstack.subList(0, callstack.size() - 1) // pop
diff --git a/src/main/protobuf/build.proto b/src/main/protobuf/build.proto
index 5652f21..c433a15 100644
--- a/src/main/protobuf/build.proto
+++ b/src/main/protobuf/build.proto
@@ -322,7 +322,7 @@
// the frame for the rule function itself is omitted.
// The file name may be relative to package's source root directory.
//
- // Requires --record_rule_instantiation_callstack=true.
+ // Requires --proto:instantiation_stack=true.
repeated string instantiation_stack = 13;
// The Starlark call stack for the definition of the rule class of this
diff --git a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkIntegrationTest.java
index 578540a..8d17f32 100644
--- a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkIntegrationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkIntegrationTest.java
@@ -253,31 +253,6 @@
}
@Test
- public void testGeneratorAttributesWhenCallstackEnabled_macro() throws Exception {
- // generator_* attributes are derived using alternative logic from the call stack when
- // --record_rule_instantiation_callstack is enabled. This test exercises that.
- scratch.file(
- "mypkg/inc.bzl",
- "def _impl(ctx):",
- " pass",
- "",
- "myrule = rule(implementation = _impl)",
- "",
- "def f(name):",
- " g()",
- "",
- "def g():",
- " myrule(name='a')",
- "");
- scratch.file("mypkg/BUILD", "load(':inc.bzl', 'f')", "f(name='foo')");
- setBuildLanguageOptions("--record_rule_instantiation_callstack");
- Rule rule = (Rule) getTarget("//mypkg:a");
- assertThat(rule.getAttr("generator_function")).isEqualTo("f");
- assertThat(rule.getAttr("generator_location")).isEqualTo("mypkg/BUILD:2:2");
- assertThat(rule.getAttr("generator_name")).isEqualTo("foo");
- }
-
- @Test
public void sanityCheckUserDefinedTestRule() throws Exception {
scratch.file(
"test/starlark/test_rule.bzl",
diff --git a/src/test/shell/bazel/external_integration_test.sh b/src/test/shell/bazel/external_integration_test.sh
index 2abf695..b45fae7 100755
--- a/src/test/shell/bazel/external_integration_test.sh
+++ b/src/test/shell/bazel/external_integration_test.sh
@@ -2378,8 +2378,7 @@
load("@data//:value.bzl", "value")
EOF
- # TODO(adonovan): add a test that the error message contains a hint to set the flag if unset.
- bazel build --record_rule_instantiation_callstack //... > "${TEST_log}" 2>&1 && fail "expected failure" || :
+ bazel build //... > "${TEST_log}" 2>&1 && fail "expected failure" || :
inplace-sed -e 's?$(pwd)/?PWD/?g' "${TEST_log}"
expect_log "you have to add.*this_repo_is_missing.*WORKSPACE"
diff --git a/src/test/shell/bazel/workspace_resolved_test.sh b/src/test/shell/bazel/workspace_resolved_test.sh
index d1a6c98..5ac0d33 100755
--- a/src/test/shell/bazel/workspace_resolved_test.sh
+++ b/src/test/shell/bazel/workspace_resolved_test.sh
@@ -1204,7 +1204,7 @@
return repo["definition_information"]
EOF
- bazel build --record_rule_instantiation_callstack //:ext_def
+ bazel build //:ext_def
cat `bazel info bazel-genfiles`/ext_def.txt > "${TEST_log}"
inplace-sed -e "s?$(pwd)/?PWD/?g" -e "s?$TEST_TMPDIR/?TEST_TMPDIR/?g" "${TEST_log}"
