[cfe-commits] PATCH: Add support for C++ namespace-aware typo correcting
Kaelyn Uhrain
rikka at google.com
Tue Jun 7 10:00:22 PDT 2011
On Mon, Jun 6, 2011 at 9:23 PM, Douglas Gregor <dgregor at apple.com> wrote:
>
> On Jun 6, 2011, at 6:13 PM, Kaelyn Uhrain wrote:
>
> Hello Doug,
>
> On Wed, Jun 1, 2011 at 9:56 AM, Douglas Gregor <dgregor at apple.com> wrote:
>
>> Hello Kaelyn,
>>
>> Sorry for the sloooow response.
>>
>
> It's no problem. After all, life has a nasty habit of getting in the way of
> coding. ;)
>
>
>>
>> On May 20, 2011, at 4:17 PM, Kaelyn Uhrain wrote:
>>
> I still have a fair bit of work to do such as having the rest of the
>> callers of CorrectTypo look for correction results in the new TypoCorrection
>> object instead of LookupResults, and to see about streamlining
>> Sema::CorrectTypo a bit more. I'm sending what I have so far not for
>> submission but to get your feedback on the new approach before I put a lot
>> of effort into polishing it.
>>
>>
>> A few comments:
>>
>> + // \brief The set of known/encountered (unique, canonicalized)
>> NamespaceDecls
>> + llvm::SmallPtrSet<NamespaceDecl*, 16> KnownNamespaces;
>>
>> This is going to need to get serialized to the AST/PCH file, so that typo
>> correction for qualified names works for namespaces defined in headers that
>> go into the precompiled header.
>>
>
> I might need a few pointers on this as I've never really used PCH files,
> much less touched any of the clang code that reads/writes them...
>
>
> Actually, don't worry about it... if you can get the rest of the patch
> ready, I'll add the AST/PCH (de-)serialization bits.
>
Awesome. Thanks a bunch! :)
>
>
>> @@ -2807,7 +2808,13 @@ LabelDecl *Sema::LookupOrCreateLabel(IdentifierInfo
>> *II, SourceLocation Loc,
>> // Typo correction
>>
>> //===----------------------------------------------------------------------===//
>>
>> +#define MAX_BUCKETS 5
>>
>> Could we get a more descriptive name than MAX_BUCKETS? And can it be a
>> "const unsigned" rather than a #define?
>>
>
> Changed to "static const unsigned MaxTypoDistanceResultSets = 5;"
>
>
> Thanks!
>
>
>> + // Only perform the qualified lookups for C++
>> + // FIXME: this breaks
>> test/CXX/basic/basic.lookup/basic.lookup.argdep/p4.cpp
>> + if (getLangOptions().CPlusPlus) {
>> + TmpRes.suppressDiagnostics();
>> + for (llvm::SmallPtrSet<IdentifierInfo*,
>> + 16>::iterator QRI =
>> QualifiedResults.begin(),
>> + QRIEnd = QualifiedResults.end();
>> + QRI != QRIEnd; ++QRI) {
>> + for (llvm::SmallPtrSet<NamespaceDecl*,
>> + 16>::iterator KNI =
>> KnownNamespaces.begin(),
>> + KNIEnd = KnownNamespaces.end();
>> + KNI != KNIEnd; ++KNI) {
>> + NameSpecifierAndSize NSS;
>> + DeclContext *Ctx = dyn_cast<DeclContext>(*KNI);
>> + TmpRes.clear();
>> + TmpRes.setLookupName(*QRI);
>> + if (!LookupQualifiedName(TmpRes, Ctx)) continue;
>> +
>> + switch (TmpRes.getResultKind()) {
>> + case LookupResult::Found:
>> + case LookupResult::FoundOverloaded:
>> + case LookupResult::FoundUnresolvedValue:
>> + if (SpecifierMap.find(Ctx) != SpecifierMap.end()) {
>> + NSS = SpecifierMap[Ctx];
>> + } else {
>> + NSS = BuildSpecifier(Context, CurContextChain, Ctx);
>> + SpecifierMap[Ctx] = NSS;
>> + }
>> + Consumer.addName((*QRI)->getName(),
>> TmpRes.getAsSingle<NamedDecl>(),
>> + ED + NSS.second, NSS.first);
>> + break;
>> + case LookupResult::NotFound:
>> + case LookupResult::NotFoundInCurrentInstantiation:
>> + case LookupResult::Ambiguous:
>> + break;
>> + }
>> + }
>> }
>> }
>>
>> I suggest always calling TmpRes.suppressDiagnostics() in the ambiguous
>> case, otherwise you may end up getting ambiguity warnings. I don't know if
>> that's the p4.cpp issue or not.
>>
>
> Its not necessary since TmpRes.suppressDiagnostics() was called just before
> the beginning of the outer loop. And to make sure nothing sneaky is
> happening, I added an assertion that diagnostics are still suppressed to the
> ambiguous case, and at least for the test suite it was never triggered. I
> think the p4.cpp issue is related to the typo correction not (yet) being
> smart enough regarding argument dependent lookup.
>
>
> Each time the inner loop calls LookupQualifiedName, it's possible that we
> could end up with an ambiguity. That ambiguity needs to be suppressed, or it
> will be reported later. Perhaps there's more suppression later, but I'd feel
> a bit more comfortable if we always did it after the switch.
>
My point was that suppressDiagnostics just sets a flag which, as far as I
can tell is not modified by LookupQualifiedName or any of the other code
within the inner loop. Unless I'm missing something (and some of the places
where I've seen suppressDiagnostics() called miss the same thing), calling
TmpRes.suppressDiagnostics() just before the loop starts will suppress
diagnostics from anything in the loop--and without assigning the same value
to an otherwise unchanged variable with every iteration.
>
> Also, a general question… when we return a typo-correction result that
>> produces a qualified name, shouldn't we be updating the CXXScopeSpec with
>> the nested-name-specifier we produce?
>>
>
> IIRC it's not uncommon (at least with
> test/SemaCXX/missing-namespace-qualifier-typo-corrections.cpp) for
> CorrectTypo to be called with a NULL CXXScopeSpec pointer. Changing it to
> always be something we can update is one of those function-signature changes
> that affect the behavior of the call sites, which is the area I've done the
> least mucking with so far. It's on the to-do list as even the one place
> where I've changed the code to use the new version of CorrectTypo breaks if
> its local LookupResult isn't updated correctly with the outcome of calling
> CorrectTypo. Which is one of the bigger reasons why I have the compatibility
> wrapper.
>
>
> Eventually, we're going to have to update CXXScopeSpec, otherwise we won't
> get the same AST's when recovering from missing qualification as we would
> when the qualification is there.
>
Ok, I've added a TODO to remind me to make sure the CXXScopeSpec is always
something we can update when CorrectTypo is called for C++ code (for when I
start cleaning up the call sites to work with the new version of
CorrectTypo).
>
> And with the new probing into namespaces, do we want to always retry the
>> search when the cache indicates a null match (or possibly for a subset of
>> instances, such as if the current DeclContext is different)?
>>
>>
>> We could retry if the set of known namespaces has changed.
>>
>
> Though this wouldn't quite cover all of the cases where a retry should be
> done, namely the case where an existing namespace has been extended since
> the null match was encountered.
>
>
> Yes, that's true.
>
>
>> This is looking great, and we're getting close to the point where I'd like
>> to put it into the tree! The major issues that I think need to be resolved
>> before we can commit are:
>> - Getting the same behavior when using PCH and when not using PCH (the
>> serialization issue mentioned at the top)
>>
> - Testsuite failures
>>
>
> As I said, the PCH matter requires a bit more learning and experimenting on
> my part since I've not done anything with them before. Fixing the test suite
> failures are a given for me, and have been a requirement for submitting the
> patch for inclusion into the tree. ;)
>
>
> I can take PCH off your todo list, since it'll be relatively quick for me
> to add that part.
>
^.^ Any adjustments I should make to the data structures to facilitate PCH
serialization and access?
Cheers,
Kaelyn
>
> - Doug
>
>
>> Thanks, Kaelyn!
>>
>> - Doug
>>
>> On Sat, Mar 26, 2011 at 4:51 AM, Douglas Gregor <dgregor at apple.com>wrote:
>>
>>>
>>> On Mar 25, 2011, at 10:15 PM, Kaelyn Uhrain wrote:
>>>
>>>
>>>
>>> On Mon, Mar 14, 2011 at 10:28 AM, Douglas Gregor <dgregor at apple.com>wrote:
>>>
>>>>
>>>> 1) Don't walk the namespaces at all; let the check against all of
>>>> the identifiers in the translation unit winnow the list down to the best
>>>> candidates based on name alone. We don't know which of these candidates is
>>>> visible, or how to get there.
>>>>
>>>
>>> The problem with first checking by name alone is that you can mistakenly
>>> discard the best match--I had that problem in early iterations of my patch.
>>> Take for example:
>>>
>>> namespace foo {
>>> namespace bar {
>>> void tree_branches() { /* ... */ }
>>> }
>>> }
>>>
>>> void three_branches() { /* ... */ }
>>>
>>> int main() {
>>> tree_branches();
>>> }
>>>
>>> Currently my patch will suggest three_branches as it has an edit distance
>>> of 1 versus an edit distance of 2 for foo::bar::tree_branches. Checking
>>> against all identifiers first would cause the TypoCorrectionConsumer to
>>> discard three_branches in favor of tree_branches since it would think
>>> tree_branches has an edit distance of 0... but will later realize
>>> tree_branches is unreachable from the current context and discard it (as the
>>> code would do now), or possibly suggest a sub-optimal correction (if the
>>> code waited to compute the qualifier). So the trick would be to figure out
>>> the qualifier needed for each identifier before making a judgment about edit
>>> distance without doing an unqualified lookup and potentially trying to
>>> figure out a valid qualified lookup for each identifier. The trick is
>>> trying to get the right info at the right time without walking through the
>>> namespaces in the AST given that the IdentifierInfo objects stored in
>>> Context.Idents lack any reference to a declaration context.
>>>
>>>
>>> Okay, that makes sense. Since we have to go through all of the
>>> identifiers anyway, we could certainly just keep several different
>>> buckets---best edit distance, best edit distance-1, best edit
>>> distance-2---so we can catch these cases. Then, if nothing in the first
>>> bucket matches, we go on to the next-best bucket, and so on.
>>>
>>> 2) When we're performing lookup for each candidate (e.g., the
>>>> calls to LookupPotentialTypoResult), first try unqualified lookup. If that
>>>> fails, save the candidate in a separate "try qualified name lookup" set.
>>>>
>>>
>>> With my above comments in mind, the unqualified lookup would have to be
>>> done for potentially every identifier in the translation unit (any
>>> subsequent identifier that has a greater edit distance than the closest
>>> correction so far that was successfully lookup can be skipped, but the
>>> worst-case scenario is for all identifiers to need to be looked up),
>>> followed by qualifier computation (involving walking the decls in the AST
>>> for child namespaces, unless I'm missing some handy method for building
>>> qualified identifiers) on every identifier that failed the unqualified
>>> lookup but does not have a greater edit distance than the closest valid
>>> unqualified identifier.
>>>
>>>
>>> We can't look up all of the identifiers. It's much, much too expensive;
>>> that's why we have the system we have, so that we can quickly narrow down to
>>> a small set of entities that we perform lookups on.
>>>
>>> It's better to guarantee acceptable performance and miss a few typo
>>> correction suggestions than it is to slow compilation down to a crawl due
>>> to, e.g., a missing header inclusion.
>>>
>>> 3) If none of the candidates can be found by unqualified lookup,
>>>> start looking in each of the namespaces we know about to see if qualified
>>>> name lookup would work to find each of the candidates. You'll likely need a
>>>> side structure containing all of the (unique, canonicalized) NamespaceDecls
>>>> in the translation unit to make this efficient.
>>>>
>>>
>>> How would building the side structure containing all of those
>>> NamespaceDecls be more efficient than ScanNamespaceForCorrections(), which
>>> stops walking through namespaces once the distance between a namespace and
>>> the current context is greater than the best edit distance known to the
>>> TypoCorrectionConsumer? Or walk any less of the AST than
>>> ScanNamespaceForCorrections?
>>>
>>>
>>> If we're only looking up a small number of identifiers, then we can
>>> perform targeted lookups of those identifiers, which (in the PCH case) boils
>>> down to a fairly quick search in an on-disk hash table. Since the number of
>>> namespaces is generally much fewer than the number of total declarations,
>>> we're doing less work.
>>>
>>>
>>>> Implemented this way, there's no additional penalty for typo correction
>>>> of visible names. Moreover, we skip the AST walk entirely, and only perform
>>>> targeted lookups for names that we know exist (because they were in the
>>>> identifier table). This also permits a few more optimizations:
>>>>
>>>> - We could (roughly) order namespaces based on their depth, so
>>>> that we'll tend to visit the more top-level (and, therefore, more likely to
>>>> have short qualifiers) namespaces first. If the qualifier for a namespace
>>>> would be longer than the shortest qualifier we've found so far, we don't
>>>> have to look in that namespace.
>>>>
>>>
>>> ScanNamespaceForCorrections already skips namespaces that would require
>>> overly-long qualifiers.
>>>
>>>
>>> Sure, but in my experience, most large namespaces (std, boost, llvm,
>>> clang) are top-level namespaces, so pruning based on overly-long qualifiers
>>> is likely to only prune away the small namespaces.
>>>
>>> I still advocate doing that pruning, but I want quick hash-table lookups
>>> based on the candidate identifiers rather than a weak of all of the contents
>>> of these namespaces.
>>>
>>> - For a given namespace, we could look for all of the candidates
>>>> in that namespace at the same time, improving locality (which is
>>>> particularly import when those lookups hit the disk in the PCH case).
>>>>
>>>
>>> ScanNamespaceForCorrections currently feeds candidates to the
>>> TypoCorrectionConsumer by namespace. Admittedly, it could store child
>>> NamespaceDecls to be searched after searching the current DeclContext
>>> instead of searching them as they are found, so that the overall search for
>>> candidates is breadth-first instead depth-first. (And now that I've thought
>>> of this, I'm going to be updating ScanNamespaceForCorrections to do so since
>>> it will further limit the number of namespaces searched).
>>>
>>>
>>> As I see it, the main issue for scalability is to avoid having to walk
>>> through the declarations in the AST, because that's going to cause massive
>>> deserialization from the PCH file. By relying primarily on the walk we have
>>> to perform through all of the known identifiers, and then doing targeted
>>> lookups into namespaces we know about, we can bound the problem to O(# of
>>> candidate identifiers * # of namespaces that are close enough).
>>>
>>> - Doug
>>>
>>
>> <clang-namespace-aware-typo-corrections2.diff>
>>
>>
>>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20110607/4e2ab29d/attachment.html>
More information about the cfe-commits
mailing list