mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +01:00
Chandler Carruth
8c64f0bfdd
Most of these are places where we failed to include a header file and simply never got an error about this. The fix is to include the header file. Most other cases are functions that should have been marked `static` but were not. Finding all of these was a main motivation for me enabling the warning despite how much work it is. One complicating factor was that we weren't including the `handle.h` for all the state-based handler functions. While this isn't a tiny amount of code, it is just declarations and doesn't add any extra dependencies. It also lets us have the checking for which functions need to be `static` and which don't. For the `parse` library I had to add the `handle.h` header as well, I tried to match the design of it in `check`. I have also had to work around a bug in the warning, but given the value it seems to be providing, that seems reasonable. I've filed the bug upstream: https://github.com/llvm/llvm-project/issues/94138 I also had to use some hacks to work around limitations of Bazel rules that wrap `cc_library` rules and don't expose `copts`. I filed a bug for `cc_proto_library` specifically: ~https://github.com/bazelbuild/bazel/issues/22610~ https://github.com/bazelbuild/bazel/issues/4446
78 lines
2.9 KiB
C++
78 lines
2.9 KiB
C++
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
|
|
// Exceptions. See /LICENSE for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
|
|
#include "toolchain/check/context.h"
|
|
#include "toolchain/check/convert.h"
|
|
#include "toolchain/check/handle.h"
|
|
|
|
namespace Carbon::Check {
|
|
|
|
auto HandleIfExprIf(Context& context, Parse::IfExprIfId node_id) -> bool {
|
|
// Alias node_id for if/then/else consistency.
|
|
auto& if_node = node_id;
|
|
|
|
auto [cond_node, cond_value_id] = context.node_stack().PopExprWithNodeId();
|
|
|
|
// Convert the condition to `bool`, and branch on it.
|
|
cond_value_id = ConvertToBoolValue(context, if_node, cond_value_id);
|
|
context.node_stack().Push(cond_node, cond_value_id);
|
|
auto then_block_id =
|
|
context.AddDominatedBlockAndBranchIf(if_node, cond_value_id);
|
|
auto else_block_id = context.AddDominatedBlockAndBranch(if_node);
|
|
|
|
// Start emitting the `then` block.
|
|
context.inst_block_stack().Pop();
|
|
context.inst_block_stack().Push(then_block_id);
|
|
context.AddCurrentCodeBlockToFunction(node_id);
|
|
|
|
context.node_stack().Push(if_node, else_block_id);
|
|
return true;
|
|
}
|
|
|
|
auto HandleIfExprThen(Context& context, Parse::IfExprThenId node_id) -> bool {
|
|
auto then_value_id = context.node_stack().PopExpr();
|
|
auto else_block_id = context.node_stack().Peek<Parse::NodeKind::IfExprIf>();
|
|
|
|
// Convert the first operand to a value.
|
|
then_value_id = ConvertToValueExpr(context, then_value_id);
|
|
|
|
// Start emitting the `else` block.
|
|
context.inst_block_stack().Push(else_block_id);
|
|
context.AddCurrentCodeBlockToFunction(node_id);
|
|
|
|
context.node_stack().Push(node_id, then_value_id);
|
|
return true;
|
|
}
|
|
|
|
auto HandleIfExprElse(Context& context, Parse::IfExprElseId node_id) -> bool {
|
|
// Alias node_id for if/then/else consistency.
|
|
auto& else_node = node_id;
|
|
|
|
auto else_value_id = context.node_stack().PopExpr();
|
|
auto then_value_id = context.node_stack().Pop<Parse::NodeKind::IfExprThen>();
|
|
auto [if_node, _] =
|
|
context.node_stack().PopWithNodeId<Parse::NodeKind::IfExprIf>();
|
|
auto cond_value_id = context.node_stack().PopExpr();
|
|
|
|
// Convert the `else` value to the `then` value's type, and finish the `else`
|
|
// block.
|
|
// TODO: Find a common type, and convert both operands to it instead.
|
|
auto result_type_id = context.insts().Get(then_value_id).type_id();
|
|
else_value_id =
|
|
ConvertToValueOfType(context, else_node, else_value_id, result_type_id);
|
|
|
|
// Create a resumption block and branches to it.
|
|
auto chosen_value_id = context.AddConvergenceBlockWithArgAndPush(
|
|
if_node, {else_value_id, then_value_id});
|
|
context.SetBlockArgResultBeforeConstantUse(chosen_value_id, cond_value_id,
|
|
then_value_id, else_value_id);
|
|
context.AddCurrentCodeBlockToFunction(node_id);
|
|
|
|
// Push the result value.
|
|
context.node_stack().Push(else_node, chosen_value_id);
|
|
return true;
|
|
}
|
|
|
|
} // namespace Carbon::Check
|