Skip to content

SIL: hoist CFGState out of the function scope #19303

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.

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

Closed
wants to merge 1 commit into from

Conversation

compnerd
Copy link
Member

Visual Studio objects to the existing construct with:

lib\SIL\SILVerifier.cpp(4448): error C2065: 'Normal': undeclared identifier
lib\SIL\SILVerifier.cpp(4448): note: This diagnostic occurred in the compiler generated function '`anonymous-namespace'::SILVerifier::verifyFlowSensitiveRules::BBState::BBState(void)'
llvm\ADT\DenseMap.h(292): note: see reference to function template instantiation 'BucketT *llvm::DenseMapBase<llvm::DenseMap<swift::SILBasicBlock *,`anonymous-namespace'::SILVerifier::verifyFlowSensitiveRules::BBState,llvm::DenseMapInfo<KeyT>,BucketT>,KeyT,ValueT,KeyInfoT,BucketT>::InsertIntoBucket<const KeyT&,>(BucketT *,KeyArg)' being compiled
      with
      [
          BucketT=llvm::detail::DenseMapPair<swift::SILBasicBlock *,`anonymous-namespace'::SILVerifier::verifyFlowSensitiveRules::BBState>,
          KeyT=swift::SILBasicBlock *,
          ValueT=`anonymous-namespace'::SILVerifier::verifyFlowSensitiveRules::BBState,
          KeyInfoT=llvm::DenseMapInfo<swift::SILBasicBlock *>,
          KeyArg=swift::SILBasicBlock *const &
      ]

Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.

Resolves SR-NNNN.

Visual Studio objects to the existing construct with:

  lib\SIL\SILVerifier.cpp(4448): error C2065: 'Normal': undeclared identifier
  lib\SIL\SILVerifier.cpp(4448): note: This diagnostic occurred in the compiler generated function '`anonymous-namespace'::SILVerifier::verifyFlowSensitiveRules::BBState::BBState(void)'
  llvm\ADT\DenseMap.h(292): note: see reference to function template instantiation 'BucketT *llvm::DenseMapBase<llvm::DenseMap<swift::SILBasicBlock *,`anonymous-namespace'::SILVerifier::verifyFlowSensitiveRules::BBState,llvm::DenseMapInfo<KeyT>,BucketT>,KeyT,ValueT,KeyInfoT,BucketT>::InsertIntoBucket<const KeyT&,>(BucketT *,KeyArg)' being compiled
        with
        [
            BucketT=llvm::detail::DenseMapPair<swift::SILBasicBlock *,`anonymous-namespace'::SILVerifier::verifyFlowSensitiveRules::BBState>,
            KeyT=swift::SILBasicBlock *,
            ValueT=`anonymous-namespace'::SILVerifier::verifyFlowSensitiveRules::BBState,
            KeyInfoT=llvm::DenseMapInfo<swift::SILBasicBlock *>,
            KeyArg=swift::SILBasicBlock *const &
        ]
@jrose-apple
Copy link
Contributor

Using CFGState::Normal would be a more minimal fix. Does that work?

@compnerd
Copy link
Member Author

compnerd commented Oct 4, 2018

I'm going to abandon this in favour of #19510

@compnerd compnerd closed this Oct 4, 2018
@compnerd compnerd deleted the hidden-enum-scope branch October 4, 2018 20:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants