Style fixes
PiperOrigin-RevId: 503956186
diff --git a/nullability_verification/pointer_nullability.cc b/nullability_verification/pointer_nullability.cc
index b407d21..4686a1f 100644
--- a/nullability_verification/pointer_nullability.cc
+++ b/nullability_verification/pointer_nullability.cc
@@ -206,29 +206,31 @@
}
std::vector<NullabilityKind> getNullabilityAnnotationsFromType(
- QualType T, llvm::function_ref<TypeParamNullability> SubstNullability) {
+ QualType T,
+ llvm::function_ref<GetTypeParamNullability> SubstituteTypeParam) {
struct Walker : NullabilityWalker<Walker> {
std::vector<NullabilityKind> Annotations;
- llvm::function_ref<TypeParamNullability> SubstNullability;
+ llvm::function_ref<GetTypeParamNullability> SubstituteTypeParam;
void report(const PointerType*, NullabilityKind NK) {
Annotations.push_back(NK);
}
void VisitSubstTemplateTypeParmType(const SubstTemplateTypeParmType* ST) {
- if (SubstNullability)
- if (auto Subst = SubstNullability(ST)) {
+ if (SubstituteTypeParam) {
+ if (auto Subst = SubstituteTypeParam(ST)) {
DCHECK_EQ(Subst->size(),
countPointersInType(ST->getCanonicalTypeInternal()))
<< "Substituted nullability has the wrong structure: "
<< QualType(ST, 0).getAsString();
- Annotations.insert(Annotations.end(), Subst->begin(), Subst->end());
+ llvm::append_range(Annotations, *Subst);
return;
}
+ }
Visit(ST->desugar());
}
} AnnotationVisitor;
- AnnotationVisitor.SubstNullability = SubstNullability;
+ AnnotationVisitor.SubstituteTypeParam = SubstituteTypeParam;
AnnotationVisitor.Visit(T);
return std::move(AnnotationVisitor.Annotations);
}
diff --git a/nullability_verification/pointer_nullability.h b/nullability_verification/pointer_nullability.h
index 94483aa..a514c87 100644
--- a/nullability_verification/pointer_nullability.h
+++ b/nullability_verification/pointer_nullability.h
@@ -95,7 +95,7 @@
/// A function that may provide enhanced nullability information for a
/// substituted template parameter (which has no sugar of its own).
-using TypeParamNullability = std::optional<std::vector<NullabilityKind>>(
+using GetTypeParamNullability = std::optional<std::vector<NullabilityKind>>(
const SubstTemplateTypeParmType* ST);
/// Traverse over a type to get its nullability. For example, if T is the type
/// Struct3Arg<int * _Nonnull, int, pair<int * _Nullable, int *>> * _Nonnull,
@@ -104,7 +104,7 @@
/// argument of Struct3Arg) do not get a nullability annotation.
std::vector<NullabilityKind> getNullabilityAnnotationsFromType(
QualType T,
- llvm::function_ref<TypeParamNullability> SubstNullability = nullptr);
+ llvm::function_ref<GetTypeParamNullability> SubstituteTypeParam = nullptr);
/// Computes the number of pointer slots within a type.
/// Each of these could conceptually be nullable, so this is the length of
