Cleaning the JSStaticScopeObject files left behind after renaming their objects to JSNameScope

• Component: JavaScriptCore
• Status: RESOLVED FIXED

[Andres Gomez Garcia]

On bug 95166 there was a re-factorization which renamed JSStaticScopeObject into JSNameScope.

However, its commit didn't actually remove the files but left them empty behind:
http://trac.webkit.org/changeset/126893/trunk/Source/JavaScriptCore/runtime/JSStaticScopeObject.cpp
http://trac.webkit.org/changeset/126893/trunk/Source/JavaScriptCore/runtime/JSStaticScopeObject.h

On http://trac.webkit.org/changeset/153298 there were re-introduced into the CMake compilation.

These files seem safe to be removed.

[Andres Gomez Garcia]

Created attachment 222177 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 222177 [details]
Patch

Rejecting attachment 222177 [details] from commit-queue.

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

Last 500 characters of output:
t 1 with fuzz 3.
patching file Source/JavaScriptCore/CMakeLists.txt
Hunk #1 succeeded at 391 (offset 7 lines).
patch: **** Only garbage was found in the patch input.
rm 'Source/JavaScriptCore/runtime/JSStaticScopeObject.cpp'
patch: **** Only garbage was found in the patch input.
rm 'Source/JavaScriptCore/runtime/JSStaticScopeObject.h'

Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Mario Sanchez Prada']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit

Full output: http://webkit-queues.appspot.com/results/5210177649246208

[Andres Gomez Garcia]

After a conversation with Mario, he said he could not remove the files since they were not there in SVN.

I've double checked and they happen to be there in the git clone and also in SVN:
https://trac.webkit.org/browser/trunk/Source/JavaScriptCore/runtime/JSStaticScopeObject.cpp
https://trac.webkit.org/browser/trunk/Source/JavaScriptCore/runtime/JSStaticScopeObject.h

Hence, the patch is still valid although maybe it has to be applied by hand.

[Mario Sanchez Prada]

Committed r164096: <http://trac.webkit.org/changeset/164096>

[Mario Sanchez Prada]

(In reply to comment #3)
> After a conversation with Mario, he said he could not remove the files since they were not there in SVN.
> 
> I've double checked and they happen to be there in the git clone and also in SVN:
> https://trac.webkit.org/browser/trunk/Source/JavaScriptCore/runtime/JSStaticScopeObject.cpp
> https://trac.webkit.org/browser/trunk/Source/JavaScriptCore/runtime/JSStaticScopeObject.h
> 
> Hence, the patch is still valid although maybe it has to be applied by hand.

Yes, the patch is indeed still valid. The reason why I could not see those files in my local checkout was... ehem... whatever :)

Committed manually then.

[Andres Gomez Garcia]

Thanks for the time and your patience ;)