Bug 127595 - Cleaning the JSStaticScopeObject files left behind after renaming their objects to JSNameScope
Summary: Cleaning the JSStaticScopeObject files left behind after renaming their objec...
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: JavaScriptCore (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-01-24 17:38 PST by Andres Gomez Garcia
Modified: 2014-02-14 03:15 PST (History)
5 users (show)

See Also:


Attachments
Patch (2.02 KB, patch)
2014-01-24 17:55 PST, Andres Gomez Garcia
mario: review+
commit-queue: commit-queue-
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Andres Gomez Garcia 2014-01-24 17:38:40 PST
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.
Comment 1 Andres Gomez Garcia 2014-01-24 17:55:49 PST
Created attachment 222177 [details]
Patch
Comment 2 WebKit Commit Bot 2014-01-27 08:01:59 PST
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
Comment 3 Andres Gomez Garcia 2014-02-13 15:18:11 PST
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.
Comment 4 Mario Sanchez Prada 2014-02-14 03:05:28 PST
Committed r164096: <http://trac.webkit.org/changeset/164096>
Comment 5 Mario Sanchez Prada 2014-02-14 03:06:26 PST
(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.
Comment 6 Andres Gomez Garcia 2014-02-14 03:15:41 PST
Thanks for the time and your patience ;)