Changeset 171648 in webkit for trunk/Source/JavaScriptCore/ftl

Timestamp:

Jul 26, 2014, 12:06:44 PM (11 years ago)

Author:

[email protected]

Message:

Unreviewed, roll out r171641-r171644. It broke some tests; will investigate and
reland later.

Source/JavaScriptCore:

• CMakeLists.txt:
• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
• JavaScriptCore.xcodeproj/project.pbxproj:
• bytecode/BytecodeList.json:
• bytecode/BytecodeUseDef.h:

(JSC::computeUsesForBytecodeOffset):
(JSC::computeDefsForBytecodeOffset):

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::dumpBytecode):
(JSC::CodeBlock::CodeBlock):
(JSC::CodeBlock::finalizeUnconditionally):
(JSC::CodeBlock::printPutByIdCacheStatus): Deleted.

• bytecode/CodeBlock.h:
• bytecode/GetByIdStatus.cpp:

(JSC::GetByIdStatus::computeForStubInfo):
(JSC::GetByIdStatus::computeFor):

• bytecode/GetByIdStatus.h:
• bytecode/GetByIdVariant.cpp:

(JSC::GetByIdVariant::dumpInContext):

• bytecode/GetByIdVariant.h:

(JSC::GetByIdVariant::structureSet):

• bytecode/Instruction.h:
• bytecode/PutByIdStatus.cpp:

(JSC::PutByIdStatus::appendVariant):
(JSC::PutByIdStatus::computeForStubInfo):
(JSC::PutByIdStatus::computeFor):

• bytecode/PutByIdStatus.h:
• bytecode/PutByIdVariant.cpp:

(JSC::PutByIdVariant::dumpInContext):
(JSC::PutByIdVariant::oldStructureForTransition): Deleted.
(JSC::PutByIdVariant::writesStructures): Deleted.
(JSC::PutByIdVariant::reallocatesStorage): Deleted.
(JSC::PutByIdVariant::attemptToMerge): Deleted.
(JSC::PutByIdVariant::attemptToMergeTransitionWithReplace): Deleted.

• bytecode/PutByIdVariant.h:

(JSC::PutByIdVariant::PutByIdVariant):
(JSC::PutByIdVariant::replace):
(JSC::PutByIdVariant::transition):
(JSC::PutByIdVariant::structure):
(JSC::PutByIdVariant::oldStructure):
(JSC::PutByIdVariant::newStructure):
(JSC::PutByIdVariant::constantChecks):

• bytecode/StructureSet.cpp:

(JSC::StructureSet::filter): Deleted.
(JSC::StructureSet::filterArrayModes): Deleted.

• bytecode/StructureSet.h:

(JSC::StructureSet::onlyStructure):

• bytecode/ToThisStatus.cpp: Removed.
• bytecode/ToThisStatus.h: Removed.
• bytecode/TypeLocation.h: Removed.
• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::BytecodeGenerator):
(JSC::BytecodeGenerator::emitMove):
(JSC::BytecodeGenerator::emitPutToScope):
(JSC::BytecodeGenerator::emitPutById):
(JSC::BytecodeGenerator::emitPutByVal):
(JSC::BytecodeGenerator::emitProfileTypesWithHighFidelity): Deleted.

• bytecompiler/BytecodeGenerator.h:

(JSC::BytecodeGenerator::isProfilingTypesWithHighFidelity): Deleted.

• bytecompiler/NodesCodegen.cpp:

(JSC::PostfixNode::emitResolve):
(JSC::PrefixNode::emitResolve):
(JSC::ReadModifyResolveNode::emitBytecode):
(JSC::AssignResolveNode::emitBytecode):
(JSC::ConstDeclNode::emitCodeSingle):
(JSC::ForInNode::emitBytecode):

• debugger/DebuggerActivation.cpp: Added.

(JSC::DebuggerActivation::DebuggerActivation):
(JSC::DebuggerActivation::finishCreation):
(JSC::DebuggerActivation::visitChildren):
(JSC::DebuggerActivation::className):
(JSC::DebuggerActivation::getOwnPropertySlot):
(JSC::DebuggerActivation::put):
(JSC::DebuggerActivation::deleteProperty):
(JSC::DebuggerActivation::getOwnPropertyNames):
(JSC::DebuggerActivation::defineOwnProperty):

• debugger/DebuggerActivation.h: Added.

(JSC::DebuggerActivation::create):
(JSC::DebuggerActivation::createStructure):

• debugger/DebuggerScope.cpp: Removed.
• debugger/DebuggerScope.h: Removed.
• dfg/DFGAbstractInterpreterInlines.h:

(JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
(JSC::DFG::AbstractInterpreter<AbstractStateType>::observeTransition):
(JSC::DFG::AbstractInterpreter<AbstractStateType>::observeTransitions):

• dfg/DFGAbstractValue.cpp:

(JSC::DFG::AbstractValue::changeStructure): Deleted.
(JSC::DFG::AbstractValue::contains): Deleted.

• dfg/DFGAbstractValue.h:

(JSC::DFG::AbstractValue::couldBeType):
(JSC::DFG::AbstractValue::isType):

• dfg/DFGByteCodeParser.cpp:

(JSC::DFG::ByteCodeParser::handlePutById):
(JSC::DFG::ByteCodeParser::parseBlock):

• dfg/DFGClobberize.h:

(JSC::DFG::clobberize):

• dfg/DFGConstantFoldingPhase.cpp:

(JSC::DFG::ConstantFoldingPhase::foldConstants):
(JSC::DFG::ConstantFoldingPhase::emitGetByOffset):
(JSC::DFG::ConstantFoldingPhase::emitPutByOffset):
(JSC::DFG::ConstantFoldingPhase::addBaseCheck): Deleted.
(JSC::DFG::ConstantFoldingPhase::addChecks): Deleted.

• dfg/DFGDoesGC.cpp:

(JSC::DFG::doesGC):

• dfg/DFGFixupPhase.cpp:

(JSC::DFG::FixupPhase::fixupNode):

• dfg/DFGGraph.cpp:

(JSC::DFG::Graph::visitChildren):
(JSC::DFG::Graph::freezeStrong):

• dfg/DFGGraph.h:
• dfg/DFGNode.cpp:

(JSC::DFG::MultiPutByOffsetData::writesStructures):
(JSC::DFG::MultiPutByOffsetData::reallocatesStorage):

• dfg/DFGNode.h:

(JSC::DFG::Node::convertToPutByOffset):
(JSC::DFG::Node::hasTransition):
(JSC::DFG::Node::convertToMultiGetByOffset): Deleted.
(JSC::DFG::Node::convertToMultiPutByOffset): Deleted.

• dfg/DFGNodeType.h:
• dfg/DFGPredictionPropagationPhase.cpp:

(JSC::DFG::PredictionPropagationPhase::propagate):

• dfg/DFGSafeToExecute.h:

(JSC::DFG::safeToExecute):

• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::silentSavePlanForGPR):

• dfg/DFGSpeculativeJIT32_64.cpp:

(JSC::DFG::SpeculativeJIT::fillSpeculateCell):
(JSC::DFG::SpeculativeJIT::compile):

• dfg/DFGSpeculativeJIT64.cpp:

(JSC::DFG::SpeculativeJIT::fillJSValue):
(JSC::DFG::SpeculativeJIT::nonSpeculativeCompareNull):
(JSC::DFG::SpeculativeJIT::emitCall):
(JSC::DFG::SpeculativeJIT::fillSpeculateInt32Internal):
(JSC::DFG::SpeculativeJIT::fillSpeculateInt32Strict):
(JSC::DFG::SpeculativeJIT::fillSpeculateInt52):
(JSC::DFG::SpeculativeJIT::fillSpeculateDouble):
(JSC::DFG::SpeculativeJIT::fillSpeculateCell):
(JSC::DFG::SpeculativeJIT::fillSpeculateBoolean):
(JSC::DFG::SpeculativeJIT::compileLogicalNot):
(JSC::DFG::SpeculativeJIT::emitBranch):
(JSC::DFG::SpeculativeJIT::compile):

• dfg/DFGStructureAbstractValue.cpp:

(JSC::DFG::StructureAbstractValue::observeTransition):
(JSC::DFG::StructureAbstractValue::observeTransitions):

• dfg/DFGStructureAbstractValue.h:

(JSC::DFG::StructureAbstractValue::onlyStructure):
(JSC::DFG::StructureAbstractValue::operator=): Deleted.
(JSC::DFG::StructureAbstractValue::set): Deleted.

• dfg/DFGValidate.cpp:

(JSC::DFG::Validate::validate):

• dfg/DFGWatchableStructureWatchingPhase.cpp:

(JSC::DFG::WatchableStructureWatchingPhase::run):

• ftl/FTLAbbreviations.h:

(JSC::FTL::getLinkage): Deleted.

• ftl/FTLCapabilities.cpp:

(JSC::FTL::canCompile):

• ftl/FTLLowerDFGToLLVM.cpp:

(JSC::FTL::LowerDFGToLLVM::compileNode):
(JSC::FTL::LowerDFGToLLVM::compilePhantomPutStructure):
(JSC::FTL::LowerDFGToLLVM::compileMultiGetByOffset):
(JSC::FTL::LowerDFGToLLVM::compileMultiPutByOffset):
(JSC::FTL::LowerDFGToLLVM::getModuleByPathForSymbol):

• heap/Heap.cpp:

(JSC::Heap::collect):

• inspector/agents/InspectorRuntimeAgent.cpp:

(Inspector::InspectorRuntimeAgent::getRuntimeTypeForVariableInTextRange): Deleted.

• inspector/agents/InspectorRuntimeAgent.h:
• inspector/protocol/Runtime.json:
• jsc.cpp:

(GlobalObject::finishCreation):
(functionDumpTypesForAllVariables): Deleted.

• llint/LLIntData.cpp:

(JSC::LLInt::Data::performAssertions):

• llint/LLIntSlowPaths.cpp:

(JSC::LLInt::LLINT_SLOW_PATH_DECL):
(JSC::LLInt::putToScopeCommon): Deleted.

• llint/LLIntSlowPaths.h:
• llint/LowLevelInterpreter.asm:
• llint/LowLevelInterpreter32_64.asm:
• llint/LowLevelInterpreter64.asm:
• runtime/ArrayBufferNeuteringWatchpoint.cpp:

(JSC::ArrayBufferNeuteringWatchpoint::createStructure):

• runtime/CommonSlowPaths.cpp:

(JSC::SLOW_PATH_DECL):

• runtime/Executable.h:

(JSC::ExecutableBase::createStructure):
(JSC::NativeExecutable::createStructure):

• runtime/HighFidelityLog.cpp: Removed.
• runtime/HighFidelityLog.h: Removed.
• runtime/HighFidelityTypeProfiler.cpp: Removed.
• runtime/HighFidelityTypeProfiler.h: Removed.
• runtime/JSObject.cpp:

(JSC::JSObject::putDirectCustomAccessor):
(JSC::JSObject::putDirectNonIndexAccessor):
(JSC::JSObject::reifyStaticFunctionsForDelete):

• runtime/JSPromiseDeferred.h:

(JSC::JSPromiseDeferred::createStructure):

• runtime/JSPromiseReaction.h:

(JSC::JSPromiseReaction::createStructure):

• runtime/JSPropertyNameIterator.h:

(JSC::JSPropertyNameIterator::createStructure):

• runtime/JSType.h:
• runtime/JSTypeInfo.h:

(JSC::TypeInfo::TypeInfo):

• runtime/MapData.h:

(JSC::MapData::createStructure):

• runtime/Options.h:
• runtime/PropertyMapHashTable.h:

(JSC::PropertyTable::createStructure):

• runtime/RegExp.h:

(JSC::RegExp::createStructure):

• runtime/SparseArrayValueMap.cpp:

(JSC::SparseArrayValueMap::createStructure):

• runtime/Structure.cpp:

(JSC::StructureTransitionTable::contains):
(JSC::StructureTransitionTable::get):
(JSC::StructureTransitionTable::add):
(JSC::Structure::Structure):
(JSC::Structure::materializePropertyMap):
(JSC::Structure::addPropertyTransition):
(JSC::Structure::despecifyFunctionTransition):
(JSC::Structure::toDictionaryTransition):
(JSC::Structure::freezeTransition):
(JSC::Structure::preventExtensionsTransition):
(JSC::Structure::takePropertyTableOrCloneIfPinned):
(JSC::Structure::nonPropertyTransition):
(JSC::Structure::flattenDictionaryStructure):
(JSC::Structure::addPropertyWithoutTransition):
(JSC::Structure::pin):
(JSC::Structure::allocateRareData):
(JSC::Structure::cloneRareDataFrom):
(JSC::Structure::getConcurrently):
(JSC::Structure::putSpecificValue):
(JSC::Structure::getPropertyNamesFromStructure):
(JSC::Structure::visitChildren):
(JSC::Structure::checkConsistency):
(JSC::Structure::toStructureShape): Deleted.

• runtime/Structure.h:

(JSC::Structure::isExtensible):
(JSC::Structure::didTransition):
(JSC::Structure::isDictionary):
(JSC::Structure::isUncacheableDictionary):
(JSC::Structure::hasBeenFlattenedBefore):
(JSC::Structure::propertyAccessesAreCacheable):
(JSC::Structure::previousID):
(JSC::Structure::hasGetterSetterProperties):
(JSC::Structure::hasReadOnlyOrGetterSetterPropertiesExcludingProto):
(JSC::Structure::setHasGetterSetterProperties):
(JSC::Structure::hasCustomGetterSetterProperties):
(JSC::Structure::setHasCustomGetterSetterProperties):
(JSC::Structure::setContainsReadOnlyProperties):
(JSC::Structure::hasNonEnumerableProperties):
(JSC::Structure::disableSpecificFunctionTracking):
(JSC::Structure::objectToStringValue):
(JSC::Structure::setObjectToStringValue):
(JSC::Structure::staticFunctionsReified):
(JSC::Structure::setStaticFunctionsReified):
(JSC::Structure::transitionWatchpointSet):
(JSC::Structure::setPreviousID):
(JSC::Structure::clearPreviousID):
(JSC::Structure::previous):
(JSC::Structure::rareData):
(JSC::Structure::setHasGetterSetterPropertiesWithProtoCheck): Deleted.
(JSC::Structure::setHasCustomGetterSetterPropertiesWithProtoCheck): Deleted.

• runtime/StructureChain.h:

(JSC::StructureChain::createStructure):

• runtime/StructureInlines.h:

(JSC::Structure::setEnumerationCache):
(JSC::Structure::enumerationCache):
(JSC::Structure::checkOffsetConsistency):

• runtime/StructureRareData.cpp:

(JSC::StructureRareData::createStructure):

• runtime/SymbolTable.cpp:

(JSC::SymbolTable::SymbolTable):
(JSC::SymbolTable::cloneCapturedNames):
(JSC::SymbolTable::uniqueIDForVariable): Deleted.
(JSC::SymbolTable::uniqueIDForRegister): Deleted.
(JSC::SymbolTable::globalTypeSetForRegister): Deleted.
(JSC::SymbolTable::globalTypeSetForVariable): Deleted.

• runtime/SymbolTable.h:

(JSC::SymbolTable::createStructure):
(JSC::SymbolTable::add):
(JSC::SymbolTable::set):

• runtime/TypeSet.cpp: Removed.
• runtime/TypeSet.h: Removed.
• runtime/VM.cpp:

(JSC::VM::VM):
(JSC::VM::getTypesForVariableInRange): Deleted.
(JSC::VM::updateHighFidelityTypeProfileState): Deleted.
(JSC::VM::dumpHighFidelityProfilingTypes): Deleted.

• runtime/VM.h:

(JSC::VM::isProfilingTypesWithHighFidelity): Deleted.
(JSC::VM::highFidelityLog): Deleted.
(JSC::VM::highFidelityTypeProfiler): Deleted.
(JSC::VM::nextLocation): Deleted.
(JSC::VM::getNextUniqueVariableID): Deleted.

• runtime/WeakMapData.h:

(JSC::WeakMapData::createStructure):

• tests/stress/fold-multi-get-by-offset-to-get-by-offset-without-folding-the-structure-check.js: Removed.
• tests/stress/fold-multi-put-by-offset-to-put-by-offset-without-folding-the-structure-check.js: Removed.
• tests/stress/prune-multi-put-by-offset-replace-or-transition-variant.js: Removed.

Source/WebCore:

• ForwardingHeaders/debugger/DebuggerActivation.h: Added.

Source/WebKit/mac:

• WebView/WebScriptDebugDelegate.mm:

Source/WTF:

• wtf/text/WTFString.h:

LayoutTests:

• js/regress/fold-get-by-id-to-multi-get-by-offset-expected.txt: Removed.
• js/regress/fold-get-by-id-to-multi-get-by-offset-rare-int-expected.txt: Removed.
• js/regress/fold-get-by-id-to-multi-get-by-offset-rare-int.html: Removed.
• js/regress/fold-get-by-id-to-multi-get-by-offset.html: Removed.
• js/regress/fold-multi-get-by-offset-to-get-by-offset-expected.txt: Removed.
• js/regress/fold-multi-get-by-offset-to-get-by-offset.html: Removed.
• js/regress/fold-multi-get-by-offset-to-poly-get-by-offset-expected.txt: Removed.
• js/regress/fold-multi-get-by-offset-to-poly-get-by-offset.html: Removed.
• js/regress/fold-multi-put-by-offset-to-poly-put-by-offset-expected.txt: Removed.
• js/regress/fold-multi-put-by-offset-to-poly-put-by-offset.html: Removed.
• js/regress/fold-multi-put-by-offset-to-put-by-offset-expected.txt: Removed.
• js/regress/fold-multi-put-by-offset-to-put-by-offset.html: Removed.
• js/regress/fold-multi-put-by-offset-to-replace-or-transition-put-by-offset-expected.txt: Removed.
• js/regress/fold-multi-put-by-offset-to-replace-or-transition-put-by-offset.html: Removed.
• js/regress/fold-put-by-id-to-multi-put-by-offset-expected.txt: Removed.
• js/regress/fold-put-by-id-to-multi-put-by-offset.html: Removed.
• js/regress/fold-put-structure-expected.txt: Removed.
• js/regress/fold-put-structure.html: Removed.
• js/regress/hoist-poly-check-structure-effectful-loop-expected.txt: Removed.
• js/regress/hoist-poly-check-structure-effectful-loop.html: Removed.
• js/regress/hoist-poly-check-structure-expected.txt: Removed.
• js/regress/hoist-poly-check-structure.html: Removed.
• js/regress/put-by-id-replace-and-transition-expected.txt: Removed.
• js/regress/put-by-id-replace-and-transition.html: Removed.
• js/regress/put-by-id-slightly-polymorphic-expected.txt: Removed.
• js/regress/put-by-id-slightly-polymorphic.html: Removed.
• js/regress/script-tests/fold-get-by-id-to-multi-get-by-offset-rare-int.js: Removed.
• js/regress/script-tests/fold-get-by-id-to-multi-get-by-offset.js: Removed.
• js/regress/script-tests/fold-multi-get-by-offset-to-get-by-offset.js: Removed.
• js/regress/script-tests/fold-multi-get-by-offset-to-poly-get-by-offset.js: Removed.
• js/regress/script-tests/fold-multi-put-by-offset-to-poly-put-by-offset.js: Removed.
• js/regress/script-tests/fold-multi-put-by-offset-to-put-by-offset.js: Removed.
• js/regress/script-tests/fold-multi-put-by-offset-to-replace-or-transition-put-by-offset.js: Removed.
• js/regress/script-tests/fold-put-by-id-to-multi-put-by-offset.js: Removed.
• js/regress/script-tests/fold-put-structure.js: Removed.
• js/regress/script-tests/hoist-poly-check-structure-effectful-loop.js: Removed.
• js/regress/script-tests/hoist-poly-check-structure.js: Removed.
• js/regress/script-tests/put-by-id-replace-and-transition.js: Removed.
• js/regress/script-tests/put-by-id-slightly-polymorphic.js: Removed.

Location:

trunk/Source/JavaScriptCore/ftl

Files:

• FTLAbbreviations.h (modified) (2 diffs)
• FTLCapabilities.cpp (modified) (1 diff)
• FTLLowerDFGToLLVM.cpp (modified) (7 diffs)

trunk/Source/JavaScriptCore/ftl/FTLAbbreviations.h

@@ -150 +150 @@
 static inline void removeFunctionAttr(LValue function, LLVMAttribute pa) { llvm->RemoveFunctionAttr(function, pa); }
 
-static inline LLVMLinkage getLinkage(LValue global) { return llvm->GetLinkage(global); }
+
+
 static inline void setLinkage(LValue global, LLVMLinkage linkage) { llvm->SetLinkage(global, linkage); }
 static inline void setVisibility(LValue global, LLVMVisibility viz) { llvm->SetVisibility(global, viz); }
@@ -162 +163 @@
 static inline LValue getFirstGlobal(LModule module) { return llvm->GetFirstGlobal(module); }
 static inline LValue getNextGlobal(LValue global) { return llvm->GetNextGlobal(global); }
+
+
+
+
 
 static inline LValue addExternFunction(LModule module, const char* name, LType type)

trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp

@@ -65 +65 @@
     case ArrayifyToStructure:
     case PutStructure:
+    case PhantomPutStructure:
     case GetButterfly:
     case NewObject:

trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp

@@ -477 +477 @@
             compilePutStructure();
             break;
+        case PhantomPutStructure:
+            compilePhantomPutStructure();
+            break;
         case GetById:
             compileGetById();
@@ -1802 +1805 @@
             weakStructure(newStructure),
             cell, m_heaps.JSCell_structureID);
+    }
+    
+    void compilePhantomPutStructure()
+    {
+        m_ftlState.jitCode->common.notifyCompilingStructureTransition(m_graph.m_plan, codeBlock(), m_node);
     }
     
@@ -3249 +3257 @@
         
         MultiGetByOffsetData& data = m_node->multiGetByOffsetData();
-
-        if (data.variants.isEmpty()) {
-            // Protect against creating a Phi function with zero inputs. LLVM doesn't like that.
-            terminate(BadCache);
-            return;
-        }
         
         Vector<LBasicBlock, 2> blocks(data.variants.size());
@@ -3332 +3334 @@
         for (unsigned i = data.variants.size(); i--;) {
             PutByIdVariant variant = data.variants[i];
-            for (unsigned j = variant.oldStructure().size(); j--;) {
-                cases.append(
-                    SwitchCase(weakStructure(variant.oldStructure()[j]), blocks[i], Weight(1)));
-            }
+            cases.append(
+                SwitchCase(weakStructure(variant.oldStructure()), blocks[i], Weight(1)));
         }
         m_out.switchInstruction(
@@ -3356 +3356 @@
                 m_graph.m_plan.transitions.addLazily(
                     codeBlock(), m_node->origin.semantic.codeOriginOwner(),
-                    variant.oldStructureForTransition(), variant.newStructure());
+                    variant.oldStructure(), variant.newStructure());
                 
                 storage = storageForTransition(
-                    base, variant.offset(),
-                    variant.oldStructureForTransition(), variant.newStructure());
-
-                ASSERT(variant.oldStructureForTransition()->indexingType() == variant.newStructure()->indexingType());
-                ASSERT(variant.oldStructureForTransition()->typeInfo().inlineTypeFlags() == variant.newStructure()->typeInfo().inlineTypeFlags());
-                ASSERT(variant.oldStructureForTransition()->typeInfo().type() == variant.newStructure()->typeInfo().type());
+                    base, variant.offset(), variant.oldStructure(), variant.newStructure());
+
+                ASSERT(variant.oldStructure()->indexingType() == variant.newStructure()->indexingType());
+                ASSERT(variant.oldStructure()->typeInfo().inlineTypeFlags() == variant.newStructure()->typeInfo().inlineTypeFlags());
+                ASSERT(variant.oldStructure()->typeInfo().type() == variant.newStructure()->typeInfo().type());
                 m_out.store32(
                     weakStructure(variant.newStructure()), base, m_heaps.JSCell_structureID);
@@ -4138 +4137 @@
         for (CString* symbol = namedFunctions.begin(); symbol != namedFunctions.end(); ++symbol) {
             LValue function = getNamedFunction(m_ftlState.module, symbol->data());
-            LLVMLinkage linkage = getLinkage(function);
-            if (linkage != LLVMInternalLinkage && linkage != LLVMPrivateLinkage)
-                setVisibility(function, LLVMHiddenVisibility);
+            setVisibility(function, LLVMHiddenVisibility);
             if (!isDeclaration(function)) {
                 setLinkage(function, LLVMPrivateLinkage);
@@ -4151 +4148 @@
         for (CString* symbol = namedGlobals.begin(); symbol != namedGlobals.end(); ++symbol) {
             LValue global = getNamedGlobal(m_ftlState.module, symbol->data());
-            LLVMLinkage linkage = getLinkage(global);
-            if (linkage != LLVMInternalLinkage && linkage != LLVMPrivateLinkage)
-                setVisibility(global, LLVMHiddenVisibility);
+            setVisibility(global, LLVMHiddenVisibility);
             if (!isDeclaration(global))
                 setLinkage(global, LLVMPrivateLinkage);