Bug 174000 – [WTF] Move SoftLinking.h into WTF

• Status: RESOLVED
• Resolution: FIXED
• Component: Web Template Framework

[Don Olmstead]

There is a SoftLinking.h file in cocoa and windows platforms. Move this over to WTF so it can be used in JSC shell and PAL.

[Don Olmstead]

Created attachment 314200 [details]
Patch

Moving file over.

Ran clang-format on the diff to get the include ordering so a few extra files were moved.

[Build Bot]

Attachment 314200 [details] did not pass style-queue:


ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:27:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:36:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:47:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:58:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:83:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:96:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:109:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:113:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:127:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:132:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:318:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:334:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:369:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:397:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:449:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:462:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:466:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:467:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:479:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:490:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:495:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:533:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/win/SoftLinking.h:259:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/win/SoftLinking.h:270:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/win/SoftLinking.h:281:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/win/SoftLinking.h:286:  Extra space before ( in function call  [whitespace/parens] [4]
Total errors found: 26 in 155 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Alex Christensen]

Comment on attachment 314200 [details]
Patch

r=me
PAL will definitely need soft linking.  What do you intend to soft link to in the JSC shell?

[WebKit Commit Bot]

Comment on attachment 314200 [details]
Patch

Rejecting attachment 314200 [details] from commit-queue.

Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'apply-attachment', '--no-update', '--non-interactive', 314200, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit

Last 500 characters of output:
.py
patching file Tools/TestWebKitAPI/Tests/WebKit/ios/AudioSessionCategoryIOS.mm
patching file Tools/TestWebKitAPI/cocoa/TestWKWebView.mm
patching file Tools/TestWebKitAPI/ios/DataInteractionSimulator.mm
patching file Tools/WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm
patching file Tools/WebKitTestRunner/ios/HIDEventGenerator.mm

Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Alex Christensen']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

Full output: http://webkit-queues.webkit.org/results/4027121

[Don Olmstead]

Created attachment 314304 [details]
Patch

Rebasing patch

[Build Bot]

Attachment 314304 [details] did not pass style-queue:


ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:27:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:36:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:47:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:58:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:83:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:96:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:109:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:113:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:127:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:132:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:318:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:334:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:369:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:397:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:449:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:462:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:466:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:467:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:479:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:490:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:495:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:533:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/win/SoftLinking.h:259:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/win/SoftLinking.h:270:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/win/SoftLinking.h:281:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/win/SoftLinking.h:286:  Extra space before ( in function call  [whitespace/parens] [4]
Total errors found: 26 in 155 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Don Olmstead]

(In reply to Alex Christensen from comment #3)
> Comment on attachment 314200 [details]
> Patch
> 
> r=me
> PAL will definitely need soft linking.  What do you intend to soft link to
> in the JSC shell?

We have some commonalities with DLLs on our platform. Was looking to see if maybe that will enable us to unify some stuff there. Also trying to figure out how to get the tests running quickly on our platform. They're way way too slow so was going to look at our dynamic library loading.

Might not help in the end but SoftLinking.h would definitely be useful for any projects embedding JSC.

[WebKit Commit Bot]

Comment on attachment 314304 [details]
Patch

Rejecting attachment 314304 [details] from commit-queue.

Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'validate-changelog', '--check-oops', '--non-interactive', 314304, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

ChangeLog entry in Source/WTF/ChangeLog contains OOPS!.

Full output: http://webkit-queues.webkit.org/results/4029706

[Don Olmstead]

Can I get another review? Original patch got a r+ but had to rebase it due to a conflict.

[Alex Christensen]

(In reply to Don Olmstead from comment #7)
> (In reply to Alex Christensen from comment #3)
> > Comment on attachment 314200 [details]
> > Patch
> > 
> > r=me
> > PAL will definitely need soft linking.  What do you intend to soft link to
> > in the JSC shell?
> 
> We have some commonalities with DLLs on our platform. Was looking to see if
> maybe that will enable us to unify some stuff there. Also trying to figure
> out how to get the tests running quickly on our platform. They're way way
> too slow so was going to look at our dynamic library loading.
> 
> Might not help in the end but SoftLinking.h would definitely be useful for
> any projects embedding JSC.

Interesting.  I'd like to see any uses of soft linking in JSC.  I'm skeptical about adding such code into WebKit, but you can do whatever you want on your platform, I guess as long as you realize that we might (unlikely) change SoftLinking.h in the future and we probably don't want to put stuff specific to your platform in our SoftLinking.h.

[WebKit Commit Bot]

Comment on attachment 314304 [details]
Patch

Rejecting attachment 314304 [details] from commit-queue.

Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'apply-attachment', '--no-update', '--non-interactive', 314304, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit

Last 500 characters of output:
.py
patching file Tools/TestWebKitAPI/Tests/WebKit/ios/AudioSessionCategoryIOS.mm
patching file Tools/TestWebKitAPI/cocoa/TestWKWebView.mm
patching file Tools/TestWebKitAPI/ios/DataInteractionSimulator.mm
patching file Tools/WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm
patching file Tools/WebKitTestRunner/ios/HIDEventGenerator.mm

Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Alex Christensen']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

Full output: http://webkit-queues.webkit.org/results/4058608

[Don Olmstead]

Created attachment 314684 [details]
Patch

Hopefully the last rebase

[Build Bot]

Attachment 314684 [details] did not pass style-queue:


ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:27:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:36:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:47:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:58:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:83:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:96:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:109:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:113:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:127:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:132:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:318:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:334:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:369:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:397:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:449:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:462:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:466:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:467:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:479:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:490:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:495:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:533:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/win/SoftLinking.h:259:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/win/SoftLinking.h:270:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/win/SoftLinking.h:281:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/win/SoftLinking.h:286:  Extra space before ( in function call  [whitespace/parens] [4]
Total errors found: 26 in 155 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Don Olmstead]

Created attachment 314687 [details]
Patch

[Build Bot]

Attachment 314687 [details] did not pass style-queue:


ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:27:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:36:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:47:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:58:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:83:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:96:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:109:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:113:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:127:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:132:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:318:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:334:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:369:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:397:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:449:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:462:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:466:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:467:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:479:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:490:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:495:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:533:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/win/SoftLinking.h:259:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/win/SoftLinking.h:270:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/win/SoftLinking.h:281:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/win/SoftLinking.h:286:  Extra space before ( in function call  [whitespace/parens] [4]
Total errors found: 26 in 155 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Don Olmstead]

Created attachment 314691 [details]
Patch

Fix iOS.

[Build Bot]

Attachment 314691 [details] did not pass style-queue:


ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:27:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:36:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:47:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:58:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:83:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:96:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:109:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:113:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:127:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:132:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:318:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:334:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:369:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:397:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:449:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:462:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:466:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:467:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:479:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:490:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:495:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/cocoa/SoftLinking.h:533:  No space between ^ and block definition.  [whitespace/brackets] [4]
ERROR: Source/WTF/wtf/win/SoftLinking.h:259:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/win/SoftLinking.h:270:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/win/SoftLinking.h:281:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WTF/wtf/win/SoftLinking.h:286:  Extra space before ( in function call  [whitespace/parens] [4]
Total errors found: 26 in 156 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Don Olmstead]

Comment on attachment 314691 [details]
Patch

Bots are good

[WebKit Commit Bot]

Comment on attachment 314691 [details]
Patch

Clearing flags on attachment: 314691

Committed r219191: <http://trac.webkit.org/changeset/219191>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.