DFG::AbstractState::merge() is still more complicated than it needs to be
https://bugs.webkit.org/show_bug.cgi?id=111619

Reviewed by Mark Hahnenberg.
        
This method is the one place where we still do some minimal amount of liveness pruning, but the style with
which it is written is awkward, and it makes an assertion about variablesAtTail that will be invalidated
by https://bugs.webkit.org/show_bug.cgi?id=111539.

* dfg/DFGAbstractState.cpp:
(JSC::DFG::AbstractState::merge):
(JSC::DFG::AbstractState::mergeVariableBetweenBlocks):
* dfg/DFGAbstractState.h:
(AbstractState):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@144989 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Build fix. Fixes problems building code that uses deprecated functions from GTK+ 2,
such as RenderThemeGtk2.cpp, in debug mode. RenderThemeGtk2.cpp tries to allow usage
of deprecated functions by undefining GTK_DISABLE_DEPRECATED, but it ended up being
redefined because autotoolsconfig.h was included again by headers that came after
config.h.

Reviewed by Martin Robinson.

* Source/autotools/SetupWebKitFeatures.m4: add checks to ensure the
autotoolsconfig.h header is only included once.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@144990 268f45cc-cd09-0410-ab3c-d52691b4dbfc