Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix indentation in CheckedCAlias.cpp #607

Merged
merged 1 commit into from
Jun 4, 2019
+26 −17
Merged

Fix indentation in CheckedCAlias.cpp #607

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 26 additions & 17 deletions lib/Sema/CheckedCAlias.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
//
// This file implements analyses for semantic checking of the Checked C language
// extension.
// This file implements analyses for semantic checking of the Checked C
// language extension.
// - Alias restrictions required by the Checked C language extension.
// - Computing what bounds expressions use variables modified by an assignment
// or increment/decrement expression.
Expand Down Expand Up @@ -124,11 +124,12 @@ using namespace sema;
// struct A tmpA = Var.myBa.myA;
// &tmpa.len
//
// One correctness concern is what happens when a computation of a path cuts off
// because of an indirection. In that case, the lvalue produced by the indirection
// can't be (or have sub-objects) subject to member bounds invariants. If it were,
// the program must have taken the address of an intermediate object. That's also
// not allowed (casts that create such pointers will be dealt with elsewhere.)
// One correctness concern is what happens when a computation of a path cuts
// off because of an indirection. In that case, the lvalue produced by the
// indirection can't be (or have sub-objects) subject to member bounds
// invariants. If it were, the program must have taken the address of an
// intermediate object. That's also not allowed (casts that create such
// pointers will be dealt with elsewhere.)

namespace {
class Helper {
Expand Down Expand Up @@ -204,10 +205,11 @@ class Helper {
};
}

// When member bounds are declared for a member, collect the dependencies on member
// paths (step 1).
// When member bounds are declared for a member, collect the dependencies on
// member paths (step 1).
namespace {
class CollectBoundsMemberUses : public RecursiveASTVisitor<CollectBoundsMemberUses> {
class CollectBoundsMemberUses :
public RecursiveASTVisitor<CollectBoundsMemberUses> {
private:
FieldDecl *MemberWithBounds;
ASTContext &Context;
Expand Down Expand Up @@ -298,8 +300,8 @@ class CheckAddressTaken : public RecursiveASTVisitor<CheckAddressTaken> {
// Taking the address of a member used in a bounds expression is not
// allowed.

ASTContext::member_bounds_iterator start = Context.using_member_bounds_begin(SuffixPath);
ASTContext::member_bounds_iterator end = Context.using_member_bounds_end(SuffixPath);
auto start = Context.using_member_bounds_begin(SuffixPath);
auto end = Context.using_member_bounds_end(SuffixPath);
bool EmittedErrorMessage = false;
for ( ; start != end; ++start) {
const FieldDecl *MemberWithBounds = *start;
Expand All @@ -308,10 +310,13 @@ class CheckAddressTaken : public RecursiveASTVisitor<CheckAddressTaken> {
// diagnose bounds-safe interfaces.
if (IsCheckedScope || MemberWithBounds->hasBoundsDeclaration(Context)) {
if (!EmittedErrorMessage) {
SemaRef.Diag(E->getBeginLoc(), diag::err_address_of_member_in_bounds) << E->getSourceRange();
SemaRef.Diag(E->getBeginLoc(),
diag::err_address_of_member_in_bounds) <<
E->getSourceRange();
EmittedErrorMessage = true;
}
SemaRef.Diag(MemberWithBounds->getBeginLoc(), diag::note_member_bounds) <<
SemaRef.Diag(MemberWithBounds->getBeginLoc(),
diag::note_member_bounds) <<
MemberWithBounds->getBoundsExpr()->getSourceRange();
}
}
Expand Down Expand Up @@ -475,7 +480,8 @@ void Sema::ModifiedBoundsDependencies::Dump(raw_ostream &OS) {
OS << "Expression:\n";
Iter->first->dump(OS);
OS << "Modified:\n";
for (auto VarIter = Iter->second.begin(); VarIter != Iter->second.end(); ++VarIter) {
for (auto VarIter = Iter->second.begin(); VarIter != Iter->second.end();
++VarIter) {
OS << "LValue expression:\n";
if (VarIter->Target.is<VarDecl *>())
VarIter->Target.get<VarDecl *>()->dump(OS);
Expand All @@ -497,7 +503,8 @@ namespace {
Sema::ModifiedBoundsDependencies &Tracker;

public:
ModifyingExprDependencies(Sema &SemaRef, Sema::ModifiedBoundsDependencies &Tracker) :
ModifyingExprDependencies(Sema &SemaRef,
Sema::ModifiedBoundsDependencies &Tracker) :
SemaRef(SemaRef), Tracker(Tracker) {}

// Statement to traverse. This iterates recursively over a statement
Expand Down Expand Up @@ -606,7 +613,9 @@ void Sema::ComputeBoundsDependencies(ModifiedBoundsDependencies &Tracker,
return;

#if DEBUG_DEPENDENCES
llvm::outs() << "Computing bounds dependencies for " << FD->getName() << ".\n";
llvm::outs() << "Computing bounds dependencies for "
<< FD->getName()
<< ".\n";
#endif

// Track parameter bounds declarations in function parameter scope.
Expand Down