Various warning and compilation fixes for stable/20211026 #3541

bnbarham · 2021-11-16T05:48:17Z

No description provided.

The index added `SymbolSubKind::UsingEnum`. Add this to the indexstore as well. Resolves rdar://84229820

Fix up merge of 5a3556a.

a3939e1 changed `PluginInterface::GetPluginName` to return a `StringRef` instead of a `ConstString`.

c020be1 changes `FindFunctions` to take a `ModuleFunctionSearchOptions` instead. There's some Swift additions that also need to be changed to use this argument instead.

14735ca renamed `eOpenOptionWrite` to `eOpenOptionWriteOnly`. Rename reference in Swift additions.

41d0b20 renamed `WillPop` to `DidPop`. Rename the override in `ThreadPlanStepInAsync`.

1457b7d introduced `GetDemangledFunctionNameWithoutArguments` for `SwiftLanguage` but had a mismatched parenthesis. Remove it.

1457b7d implemented `GetDemangledFunctionNameWithoutArguments` for `SwiftLanguage`, but it contained a few errors.

14f4430 changed `StringPrinter::SetData` to take a rvalue to prevent needless copies.

c1055f0 now passes in a valid `lldb_private::AddressRange` rather than implementations needing to query for it.

3d7161e changed `GetGlobalProperties` from returning a `std::shared_ptr` to a reference.

bnbarham · 2021-11-16T05:51:09Z

@JDevlieghere feel free to check everything, but the last few commits would be good to look at:

22c9a68: I just added -DLLDB_USE_STATIC_BINDINGS:BOOL=OFF and then ran copy-static-bindings.py, is there anything else to do there? Seems to pass locally with -DLLDB_USE_STATIC_BINDINGS:BOOL=ON now.
a0d730e: not 100% sure what happened here, but this looks like left over code (had a warning for missing Invalid)
89eca2e: is passing false for requiresOSSAModules in the call to validateSerializedAST correct?
52874b1: what do we actually want to dump here? I've just left an empty dump in TypeSystemSwift for now, but I assume we'll actually want to dump something in its subclasses.

bnbarham · 2021-11-16T05:51:20Z

@swift-ci please test

3116987 moved the switch in `ValueObjectVariable::UpdateValue` to `ValueObject::UpdateChildrenAddressType`. 31c4cc7 then reverted this change. e337350 looks to have re-applied it but moved `ValueObject::UpdateChildrenAddressType` down into `ValueObjectVariable::UpdateChildrenAddressType` and 6b16a52 enabled calling it again. Neither of these remove the old switch in `ValueObjectVariable::UpdateValue` though. Remove the duplicate switch.

swift f458d9b added checking for the dependencies of any module compiled with `-enable-ossa-modules` to also be compiled with `-enable-ossa-modules`.

9a57d1e added a `dump(llvm::raw_ostream)` to `TypeSsystem`. Implement in `TypeSystemSwift.

JDevlieghere · 2021-11-16T17:08:00Z

Adding @adrian-prantl for the Swift-related changes in LLDB.

JDevlieghere · 2021-11-16T17:09:48Z

@JDevlieghere feel free to check everything, but the last few commits would be good to look at:

22c9a68: I just added -DLLDB_USE_STATIC_BINDINGS:BOOL=OFF and then ran copy-static-bindings.py, is there anything else to do there? Seems to pass locally with -DLLDB_USE_STATIC_BINDINGS:BOOL=ON now.

Perfect.

a0d730e: not 100% sure what happened here, but this looks like left over code (had a warning for missing Invalid)

@jimingham can you please double check?

89eca2e: is passing false for requiresOSSAModules in the call to validateSerializedAST correct?

52874b1: what do we actually want to dump here? I've just left an empty dump in TypeSystemSwift for now, but I assume we'll actually want to dump something in its subclasses.

@adrian-prantl can you please double check?

bnbarham · 2021-11-16T22:49:16Z

I'm going to merge this to get the bots actually building. Dump will still need to be implemented, but we can do that later.

jimingham · 2021-11-16T23:21:48Z

On Nov 16, 2021, at 9:09 AM, Jonas Devlieghere ***@***.***> wrote: @JDevlieghere feel free to check everything, but the last few commits would be good to look at: • 22c9a68: I just added -DLLDB_USE_STATIC_BINDINGS:BOOL=OFF and then ran copy-static-bindings.py, is there anything else to do there? Seems to pass locally with -DLLDB_USE_STATIC_BINDINGS:BOOL=ON now. Perfect. • a0d730e: not 100% sure what happened here, but this looks like left over code (had a warning for missing Invalid) @jimingham can you please double check?

That code got moved to ValueObjectVariable::DoUpdateChildrenAddressType, and shouldn't be in ValueObjectVariable::UpdateValue. If you expand the file in the patch you referred to, this code is properly in the DoUpdate method. So everything is right once yp remove the redundant copy. This looks right to me. Jim

…

• 89eca2e: is passing false for requiresOSSAModules in the call to validateSerializedAST correct? • 52874b1: what do we actually want to dump here? I've just left an empty dump in TypeSystemSwift for now, but I assume we'll actually want to dump something in its subclasses. @adrian-prantl can you please double check? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub, or unsubscribe. Triage notifications on the go with GitHub Mobile for iOS or Android.

bnbarham · 2021-11-16T23:25:03Z

That code got moved to ValueObjectVariable::DoUpdateChildrenAddressType, and shouldn't be in ValueObjectVariable::UpdateValue. If you expand the file in the patch you referred to, this code is properly in the DoUpdate method. So everything is right once yp remove the redundant copy. This looks right to me. Jim

Thanks for checking! Sorry, I should have been more clear in the comment itself - the commit message mentions the duplicate code + relevant commits.

bnbarham added 12 commits November 16, 2021 10:10

[IndexStore] Add a UsingEnum subkind to match the index

dc6b8a1

The index added `SymbolSubKind::UsingEnum`. Add this to the indexstore as well. Resolves rdar://84229820

[rebranch][lldb] Fix compilation errors due to bad merge

76395c7

Fix up merge of 5a3556a.

[rebranch][lldb] Update references of PluginInterface::GetPluginName

0397ad8

a3939e1 changed `PluginInterface::GetPluginName` to return a `StringRef` instead of a `ConstString`.

[rebranch][lldb] Fix reference to moved TargetRegistry.h

11e99ff

[rebranch][lldb] Fix references to FindFunctions

d37dae1

c020be1 changes `FindFunctions` to take a `ModuleFunctionSearchOptions` instead. There's some Swift additions that also need to be changed to use this argument instead.

[rebranch][lldb] Rename reference to eOpenOptionWrite

531766e

14735ca renamed `eOpenOptionWrite` to `eOpenOptionWriteOnly`. Rename reference in Swift additions.

[rebranch][lldb] Rename reference to ThreadPlan::DidPop

e3adfbc

41d0b20 renamed `WillPop` to `DidPop`. Rename the override in `ThreadPlanStepInAsync`.

[rebranch][lldb] Fix syntax error

78caaa5

1457b7d introduced `GetDemangledFunctionNameWithoutArguments` for `SwiftLanguage` but had a mismatched parenthesis. Remove it.

[rebranch][lldb] Fix compile errors in SwiftLanguage function

a1e9fcb

1457b7d implemented `GetDemangledFunctionNameWithoutArguments` for `SwiftLanguage`, but it contained a few errors.

[rebranch][lldb] Update StringPrinter::SetData reference

0539008

14f4430 changed `StringPrinter::SetData` to take a rvalue to prevent needless copies.

[rebranch][lldb] Use front-loaded function address range

e018988

c1055f0 now passes in a valid `lldb_private::AddressRange` rather than implementations needing to query for it.

[rebranch][lldb] Update Target::GetGlobalProperties reference

19e22bd

3d7161e changed `GetGlobalProperties` from returning a `std::shared_ptr` to a reference.

bnbarham requested a review from JDevlieghere November 16, 2021 05:48

bnbarham mentioned this pull request Nov 16, 2021

[rebranch] Fix compilation failures swiftlang/swift#40168

Merged

bnbarham added 4 commits November 16, 2021 21:17

[rebranch][lldb] Rerun copy-static-bindings.py as interface has changed

22c9a68

[rebranch][lldb] Handle new requires OSSA option

06f2982

swift f458d9b added checking for the dependencies of any module compiled with `-enable-ossa-modules` to also be compiled with `-enable-ossa-modules`.

[rebranch][lldb] Add missing dump to TypeSystemSwift

a54c6c1

9a57d1e added a `dump(llvm::raw_ostream)` to `TypeSsystem`. Implement in `TypeSystemSwift.

bnbarham force-pushed the rebranch-fixes branch from 52874b1 to a54c6c1 Compare November 16, 2021 11:17

JDevlieghere requested a review from adrian-prantl November 16, 2021 17:07

bnbarham merged commit cf40296 into swiftlang:stable/20211026 Nov 16, 2021

bnbarham deleted the rebranch-fixes branch November 16, 2021 22:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Various warning and compilation fixes for stable/20211026 #3541

Various warning and compilation fixes for stable/20211026 #3541

Uh oh!

bnbarham commented Nov 16, 2021

Uh oh!

bnbarham commented Nov 16, 2021 •

edited

Loading

Uh oh!

bnbarham commented Nov 16, 2021

Uh oh!

JDevlieghere commented Nov 16, 2021

Uh oh!

JDevlieghere commented Nov 16, 2021

Uh oh!

bnbarham commented Nov 16, 2021

Uh oh!

jimingham commented Nov 16, 2021 via email

Uh oh!

bnbarham commented Nov 16, 2021

Uh oh!

Uh oh!

Various warning and compilation fixes for stable/20211026 #3541

Various warning and compilation fixes for stable/20211026 #3541

Uh oh!

Conversation

bnbarham commented Nov 16, 2021

Uh oh!

bnbarham commented Nov 16, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bnbarham commented Nov 16, 2021

Uh oh!

JDevlieghere commented Nov 16, 2021

Uh oh!

JDevlieghere commented Nov 16, 2021

Uh oh!

bnbarham commented Nov 16, 2021

Uh oh!

jimingham commented Nov 16, 2021 via email

Uh oh!

bnbarham commented Nov 16, 2021

Uh oh!

Uh oh!

bnbarham commented Nov 16, 2021 •

edited

Loading